From 56ae5d9ff9e3fe24d7bc2845998a8bd6fbe65769 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Tue, 24 Apr 2012 22:55:54 -0700 Subject: [PATCH] Layout updates --- doc/resources/ace/skeleton/csses/ace_api.css | 74 +++++++----------- .../ace/skeleton/images/arrow-footer.png | Bin 2074 -> 0 bytes .../ace/skeleton/images/header_back.png | Bin 3445 -> 0 bytes doc/resources/ace/skeleton/javascripts/ux.js | 2 +- doc/resources/common_layout.jade | 5 +- 5 files changed, 33 insertions(+), 48 deletions(-) delete mode 100644 doc/resources/ace/skeleton/images/arrow-footer.png delete mode 100644 doc/resources/ace/skeleton/images/header_back.png diff --git a/doc/resources/ace/skeleton/csses/ace_api.css b/doc/resources/ace/skeleton/csses/ace_api.css index adef4992..41523897 100644 --- a/doc/resources/ace/skeleton/csses/ace_api.css +++ b/doc/resources/ace/skeleton/csses/ace_api.css @@ -98,16 +98,12 @@ ul.topLinks { margin-right: 40%; } .brand { - background: transparent url(../images/node-logo.png) no-repeat 13px 5px; -/* margin-top: 7px;*/ -/* height: 30px;*/ - width: 105px; - outline: none; - height: 40px; - padding: 0 10px !important; - border: none; - -/* height: 30px;*/ + background: transparent url(../images/ace_logo_menu.png) no-repeat 13px 5px; + width: 105px; + outline: none; + height: 40px; + padding: 0 10px !important; + border: none; } .brand.dropdown-toggle:after { content: none; @@ -323,25 +319,9 @@ ul.menu { padding-right: 10px; margin-bottom: 5px; position: absolute; - -/* line-height: inherit; - margin-bottom: -37px; - margin-top: -42px;*/ -/* margin-left: 10px;*/ -} -.srolledHeader .memberHeader { - -/* margin-bottom: -21px; - margin-top: -27px;*/ -} -.membersContent .tabs, -.membersContent .tabs li, -.membersContent .tabs li a { -/* line-height: inherit;*/ -} -.membersContent .tabs li a { -/* display: inline;*/ + } + .tabs a.menu:after, .tabs .dropdown-toggle:after { margin-top: 22px; } @@ -350,21 +330,17 @@ ul.menu { margin-top: 14px; } -/*.backToMDN { - position: absolute; - right: 0px; - top: -20px; -}*/ +li.dropdown { + color: #2D2D2D; + font-weight: bold; +} + + .backToMDN, .editInC9 { font-size: 11px; color: #657383; margin : 0 0 0 5px; } -/*.editInC9 { -} -.backToMDN { - top: 0; -}*/ .backToMDN a, .editInC9 a { color: #657383; @@ -384,12 +360,16 @@ ul.menu { } .tabs, .pills { margin-bottom: 0; -/* margin-left: 10px; - margin-right: 10px;*/ } .srolledHeader .members .tabs { background-color: white; } + +li.dropdown { + color: #2D2D2D; + font-weight: bold; +} + .members .tabs .dropdown a, .members .tabs a.menu:after, .members .tabs .dropdown-toggle:after { @@ -470,6 +450,7 @@ ul.menu { border-radius: 0 0 6px 6px; top: 32px; right: 0px; + width: 150px; } .srolled .tabs .menu-dropdown, .srolled .tabs .dropdown-menu { top: 32px; @@ -513,8 +494,8 @@ header.filler { width: 100%; } -#container { - background: #edf5fa url(../images/main_bg.png) 0 0 repeat; +.container { + width: 100%; } /* .container-fluid .row-fluid { @@ -524,7 +505,8 @@ header.filler { }*/ .sidebarContainer { - margin-right: 25px; + width: 280px; + margin-left: 0px; } #sidebar { @@ -806,6 +788,8 @@ table td{ .mainContent { padding-top: 10px; float: right + margin-left: 0px; + width: 695px; } #documentation h3 { @@ -889,12 +873,11 @@ h3.methodToggle.active { */ #footer { - /*position:fixed; */ left:0px; bottom:0px; padding-top: 0; width:100%; - background: #101010 url(../images/footer-bg.png) repeat 0 0; + background: #101010 url(../images/dashed_back.png) repeat 0 0; color: #c3c3c3; border-top: none; font-size: 12px; @@ -907,7 +890,6 @@ h3.methodToggle.active { margin-left: auto; margin-right: auto; min-height: 60px; - background: url(../images/arrow-footer.png) no-repeat 261px 0; } #footer .footer-text { display: block; diff --git a/doc/resources/ace/skeleton/images/arrow-footer.png b/doc/resources/ace/skeleton/images/arrow-footer.png deleted file mode 100644 index d5cb078d455cdb64cf78db117299615a93787930..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2074 zcmaJ?dsGuw9*!)l81R8Lis-_aphA_&%Rq<(gd_xnD32gPNhKtM#5hSvh6XTEK&3nc zAK+;f<06G_1q(zFK^`i|0YOEqb&-dP2(=1U4i8a4ccNnVk7ehanfo~3_x-+m?|09n z`fuefz*=K57|a46Z+0Nsg6R7XGZXZ?gLYGlHY*U000~k=A{vnj!gxp&5fI=5i*`eS zkVq02eG_uUVE%@e@&$;1=f@B$U{GYlfU&R=Wn(a|?y*XdSOy_L1hiW!XX5{?zKRE= z5+*)`#v}2REGSCq9j}6d;=Xx}(Z z!~-88h>VHnIFg+iR0@Mc z0zN-@w3JkV^V3B=J%yVBq7D8PeIkc+RT# znJbyy3u{&`5j8_J9_)V|^vo2R9%J`QY|+7&;6rjW?J6|Z2hIs^VKAndK5P$uZ0DKp zTi0LOwX{h;Qh72E460&-sa2=k6FkAySck8^A`m_#80HWNr>vUSIIL0m-drQeV_Rg; zsoFQ~_Pe&NdjF(u)pzO#;g`=&57s`==>FX)bKmyl*|Yr8(${@`1R8B@Y>Z}Q5r6j0 zx(yBv4n7C^r>FI3gx`*g{HmAC<*a|0dHnKaXPeMvW~SXIE4_Vv#Wup10j~>$=!Lm{ z`t<4Z=N;hiG|R;mJL)aI?f>n&BO&&cT+1!+4a30WhWa1tuNfY;TTFmNqD&^MJ#yqo ze}Dhf)YQd`lsSj2c4pvgaL-3Zs3Xr0CCwj*zV`DI$#Tx9!0uKnurf43mq)o%s*H&V z4hhldbVE>NB;`_hIX^5cEHqSlp{}OJJEX6X#PNby-9a=c6P2fVATFyTWJEzfX!Q#+ge=6OI;iW@osd0;!OWP zU%j%nwgy4)M8lFq{KoY3^n!u{)N)ON z&F%d^7qyw=vINnGZ;y$qcaN za=BniiamYb(vZPFhK7VfVQ`}$HT-)np1SOprpgF-aYeaJ4m-v3n}v%O)n0vCpRzeM z?Wd9wg-$1&_XBsea(+|Bp8CzD$>R;y5hO-v+pUHMmalK?qetK5Q{FdPww&*37W%!w zGnvesoSaHObMx*LtKW|K<(d^!I7dbNzKWd08bqT}!0?I{UWtb1{m-6toO5op876Pq zv{NYL^$4bS*ne%g$?$-Bf9q15t0=#yNCv}0GF|1XB)2W)yX1Ckub#od!RK~e@h^WU z{(B6dU)$JXN4Kx;pubOCvXZxN-{kmsMPA69PTY^JjkW&2IFwzydi4MVt=Xf$LZ9;A z&n`0<&c*Zlw^~>=i2J^`pL=3@#$V0;U#W|$%>M@ z^XASS7#P@}N>C-$rJ1+BSgKydUzksUmeXXwd{YMW0)Oz}K`NEni5siY##kRd+0lJ0 zB{MU#r$<;6da|%OIw~qEKK|Vstu`muw*9VMXJ=<~_SarjWlFA>*V=XK`WlDfq`b(M zq5W6xU68*n-1e{D-rnKiVJqE+j__y}qY-JaFh9~_8o|jhx diff --git a/doc/resources/ace/skeleton/images/header_back.png b/doc/resources/ace/skeleton/images/header_back.png deleted file mode 100644 index c6ee9313f2d636546a778425ff998e839f05624f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3445 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 XM~`vmQcs7_00000NkvXXu0mjfem-^= diff --git a/doc/resources/ace/skeleton/javascripts/ux.js b/doc/resources/ace/skeleton/javascripts/ux.js index 7da8303c..380e4a98 100644 --- a/doc/resources/ace/skeleton/javascripts/ux.js +++ b/doc/resources/ace/skeleton/javascripts/ux.js @@ -87,7 +87,7 @@ $(document).ready(function () { var $classContent = $(this).closest('.classContent'); $(this).scrollspy({ - min: $classContent.position().top, + min: $classContent.position().top - 35, max: $classContent.position().top + $classContent.height(), onEnter: function (element, position) { var $pagination = $(element); diff --git a/doc/resources/common_layout.jade b/doc/resources/common_layout.jade index 12a5294f..5e988037 100644 --- a/doc/resources/common_layout.jade +++ b/doc/resources/common_layout.jade @@ -43,6 +43,8 @@ mixin navBar div.navbar.navbar-fixed-top div.navbar-inner div.container + a(class="brand", href="/") + ul.nav.topLinks li#ace_site a(href='http://ace.ajax.org') Ace @@ -54,7 +56,8 @@ mixin navBar mixin footer footer#footer .container - .footer-text + .footer-text.pull-right + Ace & Cloud9 IDE are © c9.io 2012 mixin endingScripts