From fa0b3ddab995568a58b1891f563a67cdeb57cddc Mon Sep 17 00:00:00 2001 From: Anders Stentebjerg Date: Thu, 7 Nov 2013 16:30:14 +0000 Subject: [PATCH 1/3] Set focus on pageName --- src/Umbraco.Web.UI.Client/src/less/panel.less | 6 +++--- src/Umbraco.Web.UI.Client/src/views/content/edit.html | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index 4db77b7d0f..fbfe126841 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -47,15 +47,15 @@ border: none; background: none; margin: 25px 0 0 20px; - padding: 0 0 3px 0; + padding: 0; height: auto; width: 100%; border-bottom: 1px dotted #f8f8f8; } .umb-panel-header .umb-headline:hover { - border-bottom: 1px dotted #ccc; - padding: 0 0 3px 0 + border-bottom: 1px dotted @grayLight; + color: @black } /* diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html index f7642001c5..e7dd85196c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html @@ -10,6 +10,7 @@ From 641d0c737fc92e7db3f3681dff6a0e2793d85e40 Mon Sep 17 00:00:00 2001 From: Anders Stentebjerg Date: Thu, 7 Nov 2013 16:51:25 +0000 Subject: [PATCH 2/3] Styling - Retina optimized gravatar - White Umbraco logo --- .../src/assets/img/application/logo.png | Bin 1409 -> 2063 bytes .../src/less/sections.less | 3 ++- .../src/less/variables.less | 1 + .../src/views/common/main.controller.js | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png index 2b2ff80a1dc68ab84d65e4772431cc35545d7105..2f02570583335964e8d5e8a924d8981a884273f1 100644 GIT binary patch delta 1469 zcmZ{kdobD;!P(sO;&w(TA#+jo#ozH;|_1HB~$H_$I88{$a#gjt=$igpB$)3ZwmMl7Ii3n^d9!()cW6faoEI_&^J#^ z)^B~Bil2V4ke?@9-OMIwaFzsvK15durV@)N1f!+5Ac+w3B#w{41~g%hnK-jL8f}>b zvn8E;QF=KQ6bY!3#zR zHr!}#F|Mhwwv{YvIpvozK`)L;>xY%t77=z{%W5U{XvKQtjqg=cdQCbg`9>kfC*b9b zovHdYmOFZSZj@0TReL-VhQhwHLCu}K-^}eo@+g!X^R$EMOy^7D!_7OXTNsX&0Q@`` zH>}?7RprW}@wR_QS4*y>mOA-Wl%>e`f-|#4Hp!&W_yXId#GF?IINztu57bnd?{lBm z;9M*1gp6FxK!nVRL8I#)WHp>Dl15;|Qp9uAwHw9@&AIamZXi*UZk(KSM&Ph&4|r}u z!{V+L*q=GBVNs`LQT}j{w@(oemCUxsNZ zN}40bQ))6B#ww(T)gxDf1#9}f;OHEY_VP{UZJ7w~+4;-trG@OBW9d*vf5#ysyYbaN z2Yw@n7uQNhJ3C#Np=QEFQWM8CnNNHW?Y31`-9_BJW!fo%eR*J2WPEYk0gZDpVp)%t z{kBi^2ds!q%Fo7nY2M{+c8+9?nwed_eqciWRz+oC5OuZ;{|)XCZIIJxG$Z%TCfSDR zyEP2i2~IGHka|?wOQr{F>+rY*HLp5HsARe(B7zg`Eq`NN+WT zbuz6O*eo!`{39|g7Fw+VSK3jTINC1*V;)Q0LcOfV!4V;iI9Q^_r0QViKrA*^(c!h1 zzG`-C8Xuw%WfL$j=g_;^$Zt0%&=*GB5(^jMQLjc`@q0!uT^(BeOC+JRt-Y~z`r-w8 k--0*one*nS%}($hfb&PHCKky)vHQq?9of;kj^xAs7g(x>R{#J2 delta 833 zcmeAdXyjJx4DfU3<&xrJU|`_&^l%9R(h4BV!3HFYtE#?CRMcQpnCR7~YM`5JU}m6T zW~gUqY+`P1uA^XNU}&IkV5Dzoq-$tyWo%?+V6gG8A|qF@sX};WUP^v>@nmf#nHUoz z6B8FlS0h6sLkmMgS0hUU7h^{!BR4a17ejL+Hv=VwirfNUUn`gV^-`XP_FWFwQC<>e8FbH4p5ty;S!0{3%m#~1^ikS^P0xP+{tg~93 zw?X#y70Z_?OJvH=pWnxSeB$Dowe!<9ELo8B*3oiZ|8MQ`uj0{cz6p`dVhc`o{AB#n zq0R8>J(ELY_JztPdJ;AK3iW1j3(6&R4R~dR|2FG1H5G=Wk*X=oMsOwZHh3 zOVM26#(@QV5`T`{=M=4DVUUkwzOZf*f6^~;hP&UiX1N*sxILk<%g#sD`&P-34nEnh z(LRb7jxA=JvcNLbb81La!>n*FTm&9Bc> z^xDSvhsU@{@{*t1yvjMnN}*13mz-I&ljSUj*o8``<2R&oHa%cCrlQhtO)Yk&b6oYw z4d3{m9O7wpTK3_M;Oyun1?embPm7W_1cwD=$`~&-s9*3icctM0%MC8+3~K7T&uq|U zsT47ve`?RU^7h~$pSJMBYeW5vrd{5gxuf23n%N_vef>OwD_T<%Y^?5lU9M;$cmCaZ z53@suCZxrNEtyuEti9}M#RR?OoTv2LADlOD?a=d+w5ag^+`3CBiT}HVT};#SpziSL zNd^(D2~EKTc~`kRI%}3pzkSM2{LZUFFU`=(Gra6o(%Z`S_i=hSh8C Date: Thu, 7 Nov 2013 17:11:35 +0000 Subject: [PATCH 3/3] Align header --- src/Umbraco.Web.UI.Client/src/less/panel.less | 39 +++++-------------- .../src/less/sections.less | 4 +- 2 files changed, 11 insertions(+), 32 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index fbfe126841..bdc552fbb5 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -53,38 +53,17 @@ border-bottom: 1px dotted #f8f8f8; } -.umb-panel-header .umb-headline:hover { +.umb-panel-header .umb-headline:hover,.umb-panel-header .umb-headline:active { border-bottom: 1px dotted @grayLight; color: @black } -/* -.umb-headline-editor-wrapper h1, h1.headline { - margin: 0; - font-size: 14px; - font-weight: 400; - text-align: left; - height: 25px; - border: 1px solid transparent; -} - -.umb-headline-editor-wrapper h1:hover { - border: 1px dashed @inputBorder; - background-color: rgba(255,255,255,0.8); - margin: -10px 0 0 -7px; - padding: 10px 0 0 7px -} -*/ - - - -.umb-headline-editor-wrapper - .help-inline{ - right: 0px; - top: 25px; - position: absolute; - font-size: 10px; - color: @red; +.umb-headline-editor-wrapper .help-inline{ + right: 0px; + top: 25px; + position: absolute; + font-size: 10px; + color: @red; } .umb-panel-header .umb-nav-tabs{ @@ -102,7 +81,7 @@ width: 100%; } .umb-panel-header p { - margin:0px 20px; + margin:0px 20px; } .umb-btn-toolbar .dimmed{ @@ -139,7 +118,7 @@ .umb-panel-header .umb-btn-toolbar { float: right; - padding: 15px 20px 0 0; + padding: 20px 20px 0 0; } .umb-panel-footer { diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less index ad866a4634..41987dff43 100644 --- a/src/Umbraco.Web.UI.Client/src/less/sections.less +++ b/src/Umbraco.Web.UI.Client/src/less/sections.less @@ -64,7 +64,7 @@ ul.sections:hover a span { ul.sections li.avatar { height: 69px; - padding: 28px 0 2px 0; + padding: 30px 0 2px 0; text-align: center; margin: 0 0 0 -4px; border-bottom: 1px solid @grayDark; @@ -80,7 +80,7 @@ ul.sections li.avatar a { ul.sections li.avatar a img { border-radius: 16px; - width: 32px + width: 30px } .faded ul.sections li {