diff --git a/core/modules/overlay/images/close.png b/core/modules/overlay/images/close.png index 44d2b6b..d39edae 100644 --- a/core/modules/overlay/images/close.png +++ b/core/modules/overlay/images/close.png @@ -1,14 +1,27 @@ PNG  - IHDRJL pHYs   -OiCCPPhotoshop ICC profilexڝSgTS=BKKoR RB&*! J!QEEȠQ, -!{kּ> H3Q5 B.@ -$pd!s#~<<+"x M0B\t8K@zB@F&S`cbP-`'{[! eDh;VEX0fK9-0IWfH  0Q){`##xFW<+*x<$9E[-qWW.(I+6aa@.y24x6_-"bbϫp@t~,/;m%h^ uf@Wp~<5j>{-]cK'Xto(hw?G%fIq^D$.Tʳ?D*A, `6B$BB -dr`)B(Ͱ*`/@4Qhp.U=pa( Aa!ڈbX#!H$ ɈQ"K5H1RT UH=r9\F;2G1Q= C7F dt1r=6Ыhڏ>C03l0.B8, c˱" VcϱwE 6wB aAHXLXNH $4 7 Q'"K&b21XH,#/{C7$C2'ITFnR#,4H#dk9, +ȅ3![ -b@qS(RjJ4e2AURݨT5ZBRQ4u9̓IKhhitݕNWGw Ljg(gwLӋT071oUX**| -J&*/Tު UUT^S}FU3S ԖUPSSg;goT?~YYLOCQ_ cx,!k u5&|v*=9C3J3WRf?qtN (~))4L1e\kXHQG6EYAJ'\'GgSSݧ -M=:.kDwn^Loy}/TmG X $ <5qo</QC]@Caaᄑ.ȽJtq]zۯ6iܟ4)Y3sCQ? 0k߬~OCOg#/c/Wװwa>>r><72Y_7ȷOo_C#dz%gA[z|!?:eAAA!h쐭!ΑiP~aa~ 'W?pX15wCsDDDޛg1O9-J5*>.j<74?.fYXXIlK9.*6nl {/]py.,:@LN8A*%w% -yg"/6шC\*NH*Mz쑼5y$3,幄'L Lݛ:v m2=:1qB!Mggfvˬen/kY- -BTZ(*geWf͉9+̳ې7ᒶKW-X潬j9(xoʿܔĹdff-[n ڴ VE/(ۻCɾUUMfeI?m]Nmq#׹=TR+Gw- 6 U#pDy  :v{vg/jBFS[b[O>zG499?rCd&ˮ/~јѡ򗓿m|x31^VwwO| (hSЧc3- cHRMz%u0`:o_FIDATx 0 D5FN;H8\bbIZL(806q:"4B03Df,3|3HU"4ݛBVbf6,.)^6fyafhV~&y]u?а qzG`~A=gU݌ UM3y&JhۻgIENDB` \ No newline at end of file + IHDRa pHYs  iTXtXML:com.adobe.xmp + + + Pixelmator 1.6.7 + + + 1 + 72 + 1 + 5 + 72 + + + 16 + 65535 + 16 + + + +6IDAT8M +@ "nzx.%x&ﲮЇCM9~3 19cSn^fWTJo&22||`'>npD| +ϩ^Zx30&k<1&]INV?/;xʀSO~ެ*fIENDB` \ No newline at end of file diff --git a/core/modules/overlay/overlay-child-rtl.css b/core/modules/overlay/overlay-child-rtl.css index 0751b56..4d88052 100644 --- a/core/modules/overlay/overlay-child-rtl.css +++ b/core/modules/overlay/overlay-child-rtl.css @@ -12,13 +12,9 @@ html { left: auto; } #overlay-close-wrapper { - left: 0; + left: 31px; right: auto; } -#overlay-close, -#overlay-close:hover { - border-radius: 12px 0 0 12px; -} /** * Tabs on the overlay. diff --git a/core/modules/overlay/overlay-child.css b/core/modules/overlay/overlay-child.css index 3bbf906..a58cb7f 100644 --- a/core/modules/overlay/overlay-child.css +++ b/core/modules/overlay/overlay-child.css @@ -3,6 +3,9 @@ * Basic styling for the Overlay child pages. */ +/* Import working version from https://drupal.org/node/1945542 */ +@import 'overlay-tabs.css'; + .js { background: transparent !important; overflow-y: scroll; @@ -26,7 +29,9 @@ width: 100%; } #overlay-titlebar { - padding: 0 20px; + background: hsla(0, 0%, 42%, 0.65); + border-top-left-radius: 5px; + border-top-right-radius: 5px; position: relative; white-space: nowrap; z-index: 100; @@ -35,12 +40,17 @@ background: #fff; clear: both; color: #000; - padding: .5em 1em; position: relative; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; +} +#overlay #page { + background: transparent; } #overlay-title-wrapper { overflow: hidden; + padding: 15px; } #overlay-title { color: #fff; @@ -63,74 +73,25 @@ #overlay-close-wrapper { position: absolute; - right: 0; /* LTR */ + right: 31px; /* LTR */ + top: 23px; } #overlay-close, #overlay-close:hover { - background: #ffffff url(images/close.png) no-repeat; - border-radius: 0 12px 12px 0; /* LTR */ + background: transparent url(images/close.png) no-repeat; display: block; - height: 26px; + height: 16px; margin: 0; padding: 0; - /* Replace with position:fixed to get a scrolling close button. */ - position: absolute; - width: 26px; -} - -/** - * Tabs on the overlay. - */ -#overlay-tabs { - line-height: 26px; - margin: -28px 0 0 0; position: absolute; - right: 20px; /* LTR */ - text-transform: uppercase; -} -#overlay-tabs li { - display: inline-block; - list-style: none; - margin: 0; - padding: 0; -} -#overlay-tabs li a, -#overlay-tabs li a:active, -#overlay-tabs li a:visited, -#overlay-tabs li a:hover { - background-color: #a6a7a2; - border-radius: 8px 8px 0 0; - color: #000; - display: inline-block; - font-size: 11px; - font-weight: bold; - margin: 0 1px; - outline: 0; - padding: 0 14px; - text-decoration: none; -} -#overlay-tabs li.active a, -#overlay-tabs li.active a.active, -#overlay-tabs li.active a:active, -#overlay-tabs li.active a:visited { - background-color: #fff; - margin-bottom: 0; - padding-bottom: 2px; -} -#overlay-tabs li a:focus, -#overlay-tabs li a:hover { - color: #fff; -} -#overlay-tabs li.active a:focus, -#overlay-tabs li.active a:hover { - color: #000; + width: 16px; } /** * Add to shortcuts link */ #overlay-titlebar .add-or-remove-shortcuts { - padding-top: 0.6em; + padding-top: 0.4em; } #overlay-titlebar .add-or-remove-shortcuts .icon { margin-top: 4px; diff --git a/core/modules/overlay/overlay-tabs.css b/core/modules/overlay/overlay-tabs.css new file mode 100644 index 0000000..d76baa3 --- /dev/null +++ b/core/modules/overlay/overlay-tabs.css @@ -0,0 +1,103 @@ +#overlay-tabs { + background-color: #fff; + border-radius: 5px 5px 0 0 ; + font-size: 13px; + font-size: 0.8125rem; + line-height: 1; +} +#overlay-tabs-primary, +#overlay-tabs-secondary { + list-style-type: none; + margin: 0; + padding: 0; + position: relative; +} +#overlay-tabs-primary li, +#overlay-tabs-secondary li { + float: left; + position: relative; +} +#overlay-tabs a { + display: block; +} +#overlay-tabs-primary { + background-color: #f2f2f0; + border-radius: 5px 5px 0 0; + border-top: 1px solid #b3b3b3; + font-size: 12px; + font-size: 0.75rem; +} +#overlay-tabs-primary:before, +#overlay-tabs-secondary:before { + content: ' '; + bottom: 0; + display: block; + height: 0; + position: absolute; + width: 100%; +} +#overlay-tabs-primary:before { + border-bottom: 1px solid #b3b3b3; +} +#overlay-tabs-secondary:before { + border-bottom: 1px solid #d9d8d4; +} +#overlay-tabs-primary li { + margin-bottom: -1px; + top: -1px; +} +#overlay-tabs-primary .active{ + z-index: 1; +} +#overlay-tabs-primary a { + border-top: 1px solid #b3b3b3; + border-left: 1px solid #b3b3b3; + border-top-left-radius: 5px; + color: #0074bd; + font-weight: bold; + padding: 0.6667em 1.25em; + text-decoration: none; + text-transform: uppercase; +} +#overlay-tabs-primary a:hover { + background-color: #fff; + color: #007ac7; + text-decoration: none; } +#overlay-tabs-primary a:active { + color: #004f80; +} +#overlay-tabs-primary .active a { + background-color: #ffffff; + border-right: 1px solid #b3b3b3; + border-top-right-radius: 5px; + /* Use two short box shadows, one shifted right and one shifted left so that + we don't have the shadow bleed under the bottom of the tab. */ + -webkit-box-shadow: 2px -1px 2px -1px rgba(0, 0, 0, 0.2), -2px -1px 2px -1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 2px -1px 2px -1px rgba(0, 0, 0, 0.2), -2px -1px 2px -1px rgba(0, 0, 0, 0.2); + box-shadow: 2px -1px 2px -1px rgba(0, 0, 0, 0.2), -2px -1px 2px -1px rgba(0, 0, 0, 0.2); + color: #004f80; +} +#overlay-tabs-primary .active ~ li a { + border-left: 0; + border-right: 1px solid #b3b3b3; + border-radius: 0 5px 0 0; +} + +#overlay-tabs-secondary a { + border-bottom: 1px solid transparent; + color: #0074bd; + margin-left: 1.1538em; + padding: 0.75em 0 0.333em; +} +#overlay-tabs-secondary .active a { + border-bottom-color: #004f80; + color: #004f80; +} +#overlay-tabs-secondary a:focus, +#overlay-tabs-secondary a:hover { + color: #008ee6 !important; + border-bottom-color: #008ee6 !important; +} +#overlay-tabs-secondary a:hover { + text-decoration: none; +} diff --git a/core/modules/overlay/overlay.module b/core/modules/overlay/overlay.module index 197d006..3b5d2b8 100644 --- a/core/modules/overlay/overlay.module +++ b/core/modules/overlay/overlay.module @@ -540,7 +540,8 @@ function overlay_preprocess_maintenance_page(&$variables) { * @see overlay.tpl.php */ function template_preprocess_overlay(&$variables) { - $variables['tabs'] = menu_primary_local_tasks(); + $variables['tabs']['#primary'] = menu_primary_local_tasks(); + $variables['tabs']['#secondary'] = menu_secondary_local_tasks(); $variables['title'] = drupal_get_title(); $variables['disable_overlay'] = overlay_disable_message(); $variables['content_attributes']['class'][] = 'clearfix'; @@ -568,6 +569,7 @@ function template_process_overlay(&$variables) { function overlay_preprocess_page(&$variables) { if (overlay_get_mode() == 'child') { unset($variables['tabs']['#primary']); + unset($variables['tabs']['#secondary']); } } diff --git a/core/modules/overlay/templates/overlay.tpl.php b/core/modules/overlay/templates/overlay.tpl.php index 38e6664..96e7e09 100644 --- a/core/modules/overlay/templates/overlay.tpl.php +++ b/core/modules/overlay/templates/overlay.tpl.php @@ -24,13 +24,20 @@
>
+
+ +

>

-
- + +
+

+ +

+
-

+
> diff --git a/core/modules/shortcut/shortcut.base.css b/core/modules/shortcut/shortcut.base.css index 8575904..4dd7767 100644 --- a/core/modules/shortcut/shortcut.base.css +++ b/core/modules/shortcut/shortcut.base.css @@ -9,7 +9,6 @@ .add-or-remove-shortcuts .icon { display: block; float: left; /* LTR */ - margin-top: 5px; } .add-or-remove-shortcuts .text { display: none; diff --git a/core/modules/shortcut/shortcut.png b/core/modules/shortcut/shortcut.png index 2924557..67bc0cb 100644 --- a/core/modules/shortcut/shortcut.png +++ b/core/modules/shortcut/shortcut.png @@ -1,5 +1,46 @@ PNG  - IHDR$ -gAMA|QPLTEإ~~~NNNlllHHHEEExxxɥpql---cd_KKK_`[| tRNSlo6e-IDAT(]Y0DB&vO7vg,>ЃZOdIAs8~/ͱ>`lL0 KfN.)~A3sژFli&8AĭJ*!ub朔{e춦c}T>U4 )EV{T52UfjJJd,U -RtWkpe:v~*s q٢,_B5/2[ddr[̜BҬwyT6VC7B% SV%[d7̹)]w1_M];<<=6a8mڴ[IENDB` \ No newline at end of file + IHDR w}Y +AiCCPICC ProfileH wTSϽ7" %z ;HQIP&vDF)VdTG"cE b PQDE݌k 5ޚYg}׺PtX4X\XffGD=HƳ.d,P&s"7C$ +E6<~&S2)212 "įl+ɘ&Y4Pޚ%ᣌ\%g|eTI(L0_&l2E9r9hxgIbטifSb1+MxL 0oE%YmhYh~S=zU&ϞAYl/$ZUm@O ޜl^ ' lsk.+7oʿ9V;?#I3eE妧KD d9i,UQ h +A1vjpԁzN6p\W p G@ +K0ށiABZyCAP8C@&*CP=#t] 4}a ٰ;GDxJ>,_“@FXDBX$!k"EHqaYbVabJ0՘cVL6f3bձX'?v 6-V``[a;p~\2n5׌ &x*sb|! +ߏƿ' Zk! $l$T4QOt"y\b)AI&NI$R$)TIj"]&=&!:dGrY@^O$ _%?P(&OJEBN9J@y@yCR nXZOD}J}/G3ɭk{%Oחw_.'_!JQ@SVF=IEbbbb5Q%O@%!BӥyҸM:e0G7ӓ e%e[(R0`3R46i^)*n*|"fLUo՝mO0j&jajj.ϧwϝ_4갺zj=U45nɚ4ǴhZ ZZ^0Tf%9->ݫ=cXgN].[7A\SwBOK/X/_Q>QG[ `Aaac#*Z;8cq>[&IIMST`ϴ kh&45ǢYYF֠9<|y+ =X_,,S-,Y)YXmĚk]c}džjcΦ浭-v};]N"&1=xtv(}'{'IߝY) Σ -rqr.d._xpUەZM׍vm=+KGǔ ^WWbj>:>>>v}/avO8 +FV> 2 u/_$\BCv< 5 ]s.,4&yUx~xw-bEDCĻHGKwFGEGME{EEKX,YFZ ={$vrK +.3\rϮ_Yq*©L_wד+]eD]cIIIOAu_䩔)3ѩiB%a+]3='/40CiU@ёL(sYfLH$%Y jgGeQn~5f5wugv5k֮\۹Nw]m mHFˍenQQ`hBBQ-[lllfjۗ"^bO%ܒY}WwvwXbY^Ю]WVa[q`id2JjGէ{׿m>PkAma꺿g_DHGGu;776ƱqoC{P38!9 ҝˁ^r۽Ug9];}}_~imp㭎}]/}.{^=}^?z8hc' +O*?f`ϳgC/Oϩ+FFGGόzˌㅿ)ѫ~wgbk?Jި9mdwi獵ޫ?cǑOO?w| x&mf2:Y~ pHYs  iTXtXML:com.adobe.xmp + + + 1 + 5 + 72 + 1 + 72 + + + 32 + 1 + 16 + + + + + + + + Pixelmator 1.6.7 + + + +sQlIDATH UmLSg~mo{[2EXP1"K.!l~l1KaBHi[l `&S\R~wZIJys>眷c ҥKL&SvmmL>+#grayscale"); /* Firefox 10+, Firefox on Android */ + filter: gray; /* IE6-9 */ + -webkit-filter: grayscale(100%); /* Chrome 19+, Safari 6+, Safari 6+ iOS */ +} /* ---------- book ----------- */ .book-navigation .menu { diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index 48b686c..e13a977 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -995,35 +995,14 @@ body.in-maintenance #branding .step-indicator { } /* Overlay theming */ -.overlay #branding { - background-color: #fff; - padding-top: 15px; - padding-bottom: 15px; -} -.overlay #branding h1.page-title, +.overlay #branding, .overlay #left, .overlay #footer { display: none; } .overlay #page { margin: 0; - padding: 0 20px; -} -.overlay #branding .breadcrumb { - float: left; /* LTR */ - position: relative; - z-index: 10; -} -#overlay-tabs { - bottom: -1px; - font-size: 1.54em; - line-height: 1.54em; - margin: 0; -} -.overlay ul.secondary { - background: transparent none; - margin: -1.4em 0 0.3em 0; /* LTR */ - overflow: visible; + padding: 15px; } .overlay #content { padding: 0; @@ -1035,7 +1014,7 @@ h1#overlay-title { /* Shortcut theming */ div.add-or-remove-shortcuts { float: left; /* LTR */ - padding-top: 0; + padding-top: 2px; padding-left: 6px; /* LTR */ }