diff --git a/docs/changelog.rst b/docs/changelog.rst --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -22,6 +22,7 @@ news alternative clone url. - enabled largefiles extension by default - optimized summary file pages and saved a lot of unused space in them +- #239 option to manually mark repository as fork fixes ----- diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py --- a/rhodecode/__init__.py +++ b/rhodecode/__init__.py @@ -52,7 +52,7 @@ def get_version(): BACKENDS = { 'hg': 'Mercurial repository', - #'git': 'Git repository', + 'git': 'Git repository', } CELERY_ON = False diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -2718,69 +2718,94 @@ div.gravatar img { border: 1px solid #316293; } -input.ui-button-small, -.ui-button-small { - background-color: #eedc94; +.ui-btn{ + color: #515151; + background-color: #DADADA; background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#F4F4F4),to(#ECECEC) ); - background-image: -moz-linear-gradient(top, #F4F4F4, #ECECEC); - background-image: -ms-linear-gradient(top, #F4F4F4, #ECECEC); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F4F4F4),color-stop(100%, #F4F4F4) ); - background-image: -webkit-linear-gradient(top, #F4F4F4, #ECECEC) ); - background-image: -o-linear-gradient(top, #F4F4F4, #ECECEC) ); - background-image: linear-gradient(top, #F4F4F4, #ECECEC); - - border-top: 1px solid #DDD !important; - border-left: 1px solid #c6c6c6 !important; - border-right: 1px solid #DDD !important; - border-bottom: 1px solid #c6c6c6 !important; - color: #515151 !important; - outline: none !important; - margin: 0 !important; - -webkit-border-radius: 4px 4px 4px 4px !important; - -khtml-border-radius: 4px 4px 4px 4px !important; - -moz-border-radius: 4px 4px 4px 4px !important; - border-radius: 4px 4px 4px 4px !important; - box-shadow: 0 1px 0 #ececec !important; - cursor: pointer !important; - padding: 3px 3px 3px 3px; -} - -input.ui-button-small.xsmall, -.ui-button-small.xsmall{ + background-image: -khtml-gradient(linear, left top, left bottom, from(#F4F4F4),to(#DADADA) ); + background-image: -moz-linear-gradient(top, #F4F4F4, #DADADA); + background-image: -ms-linear-gradient(top, #F4F4F4, #DADADA); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F4F4F4),color-stop(100%, #DADADA) ); + background-image: -webkit-linear-gradient(top, #F4F4F4, #DADADA) ); + background-image: -o-linear-gradient(top, #F4F4F4, #DADADA) ); + background-image: linear-gradient(top, #F4F4F4, #DADADA); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#F4F4F4', endColorstr='#DADADA', GradientType=0); + + border-top: 1px solid #DDD; + border-left: 1px solid #c6c6c6; + border-right: 1px solid #DDD; + border-bottom: 1px solid #c6c6c6; + color: #515151; + outline: none; + margin: 0px 3px 3px 0px; + -webkit-border-radius: 4px 4px 4px 4px !important; + -khtml-border-radius: 4px 4px 4px 4px !important; + -moz-border-radius: 4px 4px 4px 4px !important; + border-radius: 4px 4px 4px 4px !important; + box-shadow: 0 1px 0 #DADADA !important; + cursor: pointer !important; + padding: 3px 3px 3px 3px; + +} +.ui-btn.xsmall{ padding: 1px 2px 1px 1px; } -input.ui-button-small:hover, -.ui-button-small:hover, -.ui-button-small.xsmall:hover - { - background: #b4b4b4 url("../images/button_selected.png") repeat-x !important; - border-top: 1px solid #ccc !important; - border-left: 1px solid #bebebe !important; - border-right: 1px solid #b1b1b1 !important; - border-bottom: 1px solid #afafaf !important; - text-decoration: none; -} - -input.ui-button-small-blue,.ui-button-small-blue { - background: #4e85bb url("../images/button_highlight.png") repeat-x; - border-top: 1px solid #5c91a4; - border-left: 1px solid #2a6f89; - border-right: 1px solid #2b7089; - border-bottom: 1px solid #1a6480; - color: #fff; - -webkit-border-radius: 4px 4px 4px 4px; - -khtml-border-radius: 4px 4px 4px 4px; - -moz-border-radius: 4px 4px 4px 4px; - border-radius: 4px 4px 4px 4px; - box-shadow: 0 1px 0 #ececec; - cursor: pointer; - padding: 0px 2px 1px 2px; -} - -input.ui-button-small-blue:hover { - +.ui-btn:focus { + outline: none; +} +.ui-btn:hover{ + background-position: 0 -15px; + text-decoration: none; + color: #515151; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25), 0 0 3px #FFFFFF !important; +} + +.ui-btn.red{ + color:#fff; + background-color: #c43c35; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); + background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(top, #ee5f5b, #c43c35); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); + border-color: #c43c35 #c43c35 #882a25; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} + + +.ui-btn.blue{ + background-color: #339bb9; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); + background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); + background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); + background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); + background-image: -o-linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(top, #5bc0de, #339bb9); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); + border-color: #339bb9 #339bb9 #22697d; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} + +.ui-btn.green{ + background-color: #57a957; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -ms-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(top, #62c462, #57a957); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); + border-color: #57a957 #57a957 #3d773d; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } ins,div.options a:hover { diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html --- a/rhodecode/templates/admin/settings/settings.html +++ b/rhodecode/templates/admin/settings/settings.html @@ -157,7 +157,7 @@
- ${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'),class_="ui-button-small")} + ${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'),class_="ui-btn")}
diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -171,7 +171,7 @@
${_('No repositories yet')} %if h.HasPermissionAny('hg.admin','hg.create.repository')(): - ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-button-small")} + ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-btn")} %endif
%endif diff --git a/rhodecode/templates/bookmarks/bookmarks_data.html b/rhodecode/templates/bookmarks/bookmarks_data.html --- a/rhodecode/templates/bookmarks/bookmarks_data.html +++ b/rhodecode/templates/bookmarks/bookmarks_data.html @@ -21,9 +21,9 @@ ${h.person(book[1].author)} r${book[1].revision}:${h.short_id(book[1].raw_id)} - ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=book[1].raw_id),class_="ui-button-small xsmall")} + ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=book[1].raw_id),class_="ui-btn xsmall")} | - ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id),class_="ui-button-small xsmall")} + ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id),class_="ui-btn xsmall")} %endfor diff --git a/rhodecode/templates/branches/branches_data.html b/rhodecode/templates/branches/branches_data.html --- a/rhodecode/templates/branches/branches_data.html +++ b/rhodecode/templates/branches/branches_data.html @@ -20,9 +20,9 @@ ${h.person(branch[1].author)} r${branch[1].revision}:${h.short_id(branch[1].raw_id)} - ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small xsmall")} + ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-btn xsmall")} | - ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small xsmall")} + ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-btn xsmall")} %endfor @@ -40,9 +40,9 @@ ${h.person(branch[1].author)} r${branch[1].revision}:${h.short_id(branch[1].raw_id)} - ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small xsmall")} + ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-btn xsmall")} | - ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-button-small xsmall")} + ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id),class_="ui-btn xsmall")} %endfor diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -34,7 +34,7 @@
${h.form(h.url.current(),method='get')}
- ${h.submit('set',_('Show'),class_="ui-button-small")} + ${h.submit('set',_('Show'),class_="ui-btn")} ${h.text('size',size=1,value=c.size)} ${_('revisions')}
diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html --- a/rhodecode/templates/changeset/changeset_file_comment.html +++ b/rhodecode/templates/changeset/changeset_file_comment.html @@ -22,7 +22,7 @@
%if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
- ${_('Delete')} + ${_('Delete')}
%endif ${h.rst(co.text)|n} @@ -45,8 +45,8 @@
- ${h.submit('save', _('Comment'), class_='ui-button-small')} - ${h.reset('hide-inline-form', _('Hide'), class_='ui-button-small hide-inline-form')} + ${h.submit('save', _('Comment'), class_='ui-btn')} + ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
${h.end_form()} %else: @@ -57,7 +57,7 @@
- ${h.reset('hide-inline-form', _('Hide'), class_='ui-button-small hide-inline-form')} + ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
${h.end_form()} %endif diff --git a/rhodecode/templates/files/files_add.html b/rhodecode/templates/files/files_add.html --- a/rhodecode/templates/files/files_add.html +++ b/rhodecode/templates/files/files_add.html @@ -46,7 +46,7 @@
- + ${_('or')} ${_('Upload file')}
- + ${_('or')} ${_('Create new file')}
@@ -78,8 +78,8 @@
- ${h.submit('commit',_('Commit changes'),class_="ui-button-small")} - ${h.reset('reset',_('Reset'),class_="ui-button-small")} + ${h.submit('commit',_('Commit changes'),class_="ui-btn")} + ${h.reset('reset',_('Reset'),class_="ui-btn")}
${h.end_form()}