kallithea Changeset - 9af9953a3159

Changeset - 9af9953a3159

Parent rev.

Child rev.

[Not reviewed]

rhodecode-2.2.5-gpl

0 8 0

Mads Kiilerich - 12 years ago 2013-12-10 19:28:05
madski@unity3d.com

old style: make settings box expand to contain floating content and show menu nicely

The floating of the panes is hardcoded, so we also hardcode the necessary overflow auto.

8 files changed with 17 insertions and 7 deletions:

rhodecode/public/css/style.css

rhodecode/templates/admin/my_account/my_account.html

rhodecode/templates/admin/permissions/permissions.html

rhodecode/templates/admin/repo_groups/repo_group_edit.html

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/admin/settings/settings.html

rhodecode/templates/admin/user_groups/user_group_edit.html

rhodecode/templates/admin/users/user_edit.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -3590,24 +3590,34 @@ div.gravatar img { @@
     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;
     border-radius: 4px 4px 4px 4px !important;
     cursor: pointer !important;
     padding: 3px 3px 3px 3px;
     background-position: 0 -100px;
     display: inline-block;
+}
 ul.nav-stacked {
     margin: 20px;
     color: #393939;
     font-weight: 700;
+}
 ul.nav-stacked a {
     color: inherit;
+}
 /* make .btn inputs and buttons and divs look the same */
 button.btn,
 input.btn {
     font-family: inherit;
     font-size: inherit;
     line-height: inherit;
+}
 .btn::-moz-focus-inner {
     border: 0;
     padding: 0;
+}

rhodecode/templates/admin/my_account/my_account.html

➞

Show inline comments

@@ @@ -8,25 +8,25 @@ @@
     %endif
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('My Account')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
+<div class="box" style="overflow:auto">
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ##main
     <div style="width: 150px; float:left">
         <ul class="nav nav-pills nav-stacked">
           <li>
            <div class="gravatar_box" style="height: 26px">
                <div class="gravatar" style="float: left">
                    <img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/>
                </div>

rhodecode/templates/admin/permissions/permissions.html

➞

Show inline comments

@@ @@ -11,25 +11,25 @@ @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${_('Permissions')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
+<div class="box" style="overflow:auto">
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ##main
     <div style="width: 150px; float:left">
         <ul class="nav nav-pills nav-stacked">
           <li>
            <div class="gravatar_box" style="height: 26px">
                <div class="gravatar" style="float: left">
                 <i class="icon-ban-circle" style="font-size: 26px"></i>
                </div>

rhodecode/templates/admin/repo_groups/repo_group_edit.html

➞

Show inline comments

@@ @@ -22,25 +22,25 @@ @@
     <ul class="links">
       <li>
           <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_(u'Add Child Group')}</a>
       </li>
     </ul>
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
+<div class="box" style="overflow:auto">
     <div class="title">
         ${self.breadcrumbs()}
         ${self.breadcrumbs_side_links()}
     </div>
     ##main
     <div style="width: 150px; float:left">
         <ul class="nav nav-pills nav-stacked">
           <li>
            <div class="gravatar_box" style="height: 26px">
              <div class="gravatar" style="float: left">
                 <i class="icon-folder-close" style="font-size: 26px"></i>

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -12,25 +12,25 @@ @@
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Settings')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
 ${self.repo_context_bar('options')}
 <div class="box">
+<div class="box" style="overflow:auto">
     <!--<div class="title">-->
         <!--${self.breadcrumbs()}-->
     <!--</div>-->
     ##main
     <div style="width: 150px; float:left">
         <ul class="nav nav-pills nav-stacked">
           <!--<li>-->
            <!--<div class="gravatar_box" style="height: 26px">-->
              <!--<div class="gravatar" style="float: left">-->
                 <!--<i class="icon-group" style="font-size: 26px"></i>-->
              <!--</div>-->

rhodecode/templates/admin/settings/settings.html

➞

Show inline comments

@@ @@ -10,25 +10,25 @@ @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${_('Settings')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
+<div class="box" style="overflow:auto">
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ##main
     <div style="width: 150px; float:left">
         <ul class="nav nav-pills nav-stacked">
           <li>
            <div class="gravatar_box" style="height: 26px">
                <div class="gravatar" style="float: left">
                 <i class="icon-cog" style="font-size: 26px"></i>
                </div>

rhodecode/templates/admin/user_groups/user_group_edit.html

➞

Show inline comments

@@ @@ -12,25 +12,25 @@ @@
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('User Groups'),h.url('users_groups'))}
     &raquo;
     ${c.user_group.users_group_name}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
+<div class="box" style="overflow:auto">
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ##main
     <div style="width: 150px; float:left">
         <ul class="nav nav-pills nav-stacked">
           <li>
            <div class="gravatar_box" style="height: 26px">
              <div class="gravatar" style="float: left">
                 <i class="icon-group" style="font-size: 26px"></i>
              </div>

rhodecode/templates/admin/users/user_edit.html

➞

Show inline comments

@@ @@ -12,25 +12,25 @@ @@
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     &raquo;
     ${c.user.username}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
+<div class="box" style="overflow:auto">
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ##main
     <div style="width: 150px; float:left">
         <ul class="nav nav-pills nav-stacked">
           <li>
            <div class="gravatar_box" style="height: 26px">
                <div class="gravatar" style="float: left">
                    <img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/>
                </div>

0 comments (0 inline, 0 general)