1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/eb69169a04ef/ Changeset: eb69169a04ef User: james_taylor Date: 2013-09-18 20:13:36 Summary: style: Restore margin to bottom of nav-tabs, normalize tab border colors Affected #: 3 files diff -r 01f603a2179fce1cb39f5cfde973744585c73918 -r eb69169a04efb1fba610b943fd38a8ceb991d315 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -505,12 +505,12 @@ .nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#303030} .nav .nav-divider{height:1px;margin:7.5px 0;overflow:hidden;background-color:#e5e5e5} .nav>li>a>img{max-width:none} -.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:3px 3px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd} -.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default} +.nav-tabs{border-bottom:1px solid #bfbfbf}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:3px 3px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #bfbfbf} +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #bfbfbf;border-bottom-color:transparent;cursor:default} .nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px} @media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:3px} -.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd} -@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:3px 3px 0 0} .nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}} +.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #bfbfbf} +@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #bfbfbf;border-radius:3px 3px 0 0} .nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}} .nav-pills>li{float:left}.nav-pills>li>a{border-radius:5px} .nav-pills>li+li{margin-left:2px} .nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#303030} @@ -518,8 +518,8 @@ .nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px} @media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}} .nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:3px} -.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd} -@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:3px 3px 0 0} .nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}} +.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #bfbfbf} +@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #bfbfbf;border-radius:3px 3px 0 0} .nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}} .tabbable:before,.tabbable:after{content:" ";display:table;} .tabbable:after{clear:both} .tabbable:before,.tabbable:after{content:" ";display:table;} @@ -756,9 +756,7 @@ .btn.active,.btn:active{color:inherit} .dropdown-menu{max-width:auto} input[type="checkbox"],input[type="radio"]{margin-left:0.5ex;margin-right:0.5ex} -.nav-tabs{border-bottom:1px solid #bfbfbf} -.nav-tabs>li>a:hover{border-color:#eee #eee #bfbfbf} -.nav-tabs>.active>a,.nav-tabs>.active>a:hover{border:1px solid #bfbfbf;border-bottom-color:transparent} +.nav-tabs{margin-bottom:15px} a{text-decoration:underline} label{font-weight:normal} @font-face{font-family:'FontAwesome';src:url('../images/fonts/fontawesome-webfont.eot');src:url('../images/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),url('../images/fonts/fontawesome-webfont.woff') format('woff'),url('../images/fonts/fontawesome-webfont.ttf') format('truetype');font-weight:normal;font-style:normal}.fa-icon,[class^="fa-icon-"],[class*=" fa-icon-"]{font-family:FontAwesome;font-size:1.1666666666666667em;background-image:none !important;background-position:0% 0%;background-repeat:repeat} diff -r 01f603a2179fce1cb39f5cfde973744585c73918 -r eb69169a04efb1fba610b943fd38a8ceb991d315 static/style/src/less/galaxy_bootstrap/overrides.less --- a/static/style/src/less/galaxy_bootstrap/overrides.less +++ b/static/style/src/less/galaxy_bootstrap/overrides.less @@ -57,15 +57,5 @@ // Tabs -- border color is hardcoded in navs.less, change to @btnBorder here .nav-tabs { - border-bottom: 1px solid @btn-default-border; -} -.nav-tabs > li > a { - &:hover { - border-color: @gray-lighter @gray-lighter @btn-default-border; - } -} -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - border: 1px solid @btn-default-border; - border-bottom-color: transparent; + margin-bottom: 15px; } \ No newline at end of file diff -r 01f603a2179fce1cb39f5cfde973744585c73918 -r eb69169a04efb1fba610b943fd38a8ceb991d315 static/style/src/less/galaxy_bootstrap/variables.less --- a/static/style/src/less/galaxy_bootstrap/variables.less +++ b/static/style/src/less/galaxy_bootstrap/variables.less @@ -373,15 +373,15 @@ @nav-open-caret-border-color: @white; // Tabs -@nav-tabs-border-color: #ddd; +@nav-tabs-border-color: @border-default-color; @nav-tabs-link-hover-border-color: @gray-lighter; @nav-tabs-active-link-hover-bg: @body-bg; @nav-tabs-active-link-hover-color: @gray; -@nav-tabs-active-link-hover-border-color: #ddd; +@nav-tabs-active-link-hover-border-color: @border-default-color; -@nav-tabs-justified-link-border-color: #ddd; +@nav-tabs-justified-link-border-color: @border-default-color; @nav-tabs-justified-active-link-border-color: @body-bg; // Pills Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.