From a5f34e67c7e838664087fe77da08e33a5fb89c39 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Fri, 4 May 2012 21:25:19 -0700 Subject: [PATCH] made favicon sexier; extracted form-block into its own custom class; made the title of pages less caps-lock. --- app/assets/images/favicon.ico | Bin 1406 -> 1150 bytes app/assets/images/favicon.png | Bin 317 -> 1666 bytes app/assets/stylesheets/new-templates.css.scss | 4 + app/assets/stylesheets/new_styles/_forms.scss | 105 ++++++++++++ app/assets/stylesheets/new_styles/_login.scss | 24 +++ .../stylesheets/new_styles/_registration.scss | 96 ----------- app/helpers/layout_helper.rb | 2 +- app/views/layouts/post.html.haml | 4 +- app/views/registrations/new.html.erb | 2 +- app/views/sessions/new.haml | 3 +- app/views/sessions/new_working_copy.html.erb | 32 ++++ public/be_back_soon.html | 159 ------------------ public/favicon.ico | Bin 1406 -> 1150 bytes public/favicon.png | Bin 317 -> 0 bytes 14 files changed, 170 insertions(+), 261 deletions(-) create mode 100644 app/assets/stylesheets/new_styles/_forms.scss create mode 100644 app/assets/stylesheets/new_styles/_login.scss create mode 100644 app/views/sessions/new_working_copy.html.erb delete mode 100644 public/be_back_soon.html delete mode 100644 public/favicon.png diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico index 803b71204dc940f82667b285c878769758d62059..c07db736300e1af7689b4e9945f08be4767dbc29 100644 GIT binary patch literal 1150 zcmbtTJ7}6w6#gZJOr?R+Lg|tWMNQQ_G{&N$q|rD;6D6@~;``C6s0fOf4kbfr5Vw-S zQQhoZIyrRgkSxtox`~;(7&CP!r{}xyi%2u|%DMl!=brC8zH^l%1^*TnBwmZsn|qS< zm^Bp(Op7cEu}hMj?`9VfDQ0DDZS94{VtH@3+glK`*?h`2{jA^YS*O!I-QM2*a&T}! zM@L5#4u^$6ht1(|d|h2#eLjoBS+CbS+-~;`FtJ#S5{U$*QYj(vc$}iqsEFn9cy0{_ zgJU{|R;zuqySw`fK7l}hYPA}joSaPZ*Xwm^Hk;)4`zaEM5XZP#Sy@raF}Ak0KFN7o ztrnY!uCK4@@bFO74IQi7?TXqEgZuoZEkMHtyb%Yq@0^j_2`~XLyUZ3Oocl{u`LJTCKh>```6tpZWFmbqBw#*AUiUa*uQW@|Pr{|B=5F C$9Q)D literal 1406 zcmeH@!3~2j3`IXt3Wx|4MO74W>X8*#fC1P6sROVAJFo!*umU5n0GrfydT4v-p{E`& zdSCu_WGn*-eb$0B$Nd6$01ZJU+z75qB!Dv!Dslr^mI)yQFiq14ZQFwBx=!f(9>XvQ z<2YiPCSjguFw3$C>$-y3woTag9n5hYafegS3!E4Dn+vGVc;8GZ@+#$GDk&w}T1`b! zZlH42Q^Zos8RIO!he&>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPA){ffi_eM3D1{oGuTzrd=COM+4n&cLd=IHa;5RX-@T zIKQ+g85kdF$}r8qu)}W=NFmTQR{lkqz(`5Vami0E%}vcK@pQ3O0?O#6WTsfTnVY*A z8k(CJm>U_GSr{5x7#cZQIGb3QyP8nKn^_fq~-y0Oc5|^h+pdAXJBC3B*w$lqpvd0)-;d77c;xTn;j)%PQsvS?9^KMTj@D@o3oqPV+r67>UGEOIgH6eg zFDM2t2w48=hQn44*&`QJre-yNRF@K7eC*4d?sz+n_fPkgpR@fw?>Eo>`}*I~Bd3*= zm3ftyZ@>Ju?D!nN=Ms;%Z{NN%YVEez_19|!-G>tj~+cSG z=&WA7+Q`^gxxKyJ>%f`f;^IvkH!5z7@ZoG+7_2Y5;wh)4~$~tY7bKH~;#l86Cc?=Uz6< z*+0eKO>ROD@0Npqs;aA(256l4`E%!&FJD%8zY*L}?~}7{Qg7@wSq~Kr@4`dA^&6TUAdKK?l` z5C3xo11qav-2d1-TJ}y$*==BByc SUOyIqY6VYMKbLh*2~7ZH{(R5? delta 301 zcmV+|0n+}04ZQ-88Gi%-006c6H|hWY0R%}zK~yMHV_<*-XIqB5hVu;nC3gYkO{YSHf$$H6X8Z>eVgJp* z$)NfSt^f;^3}SeDal`+V|J)c-7XN$xU;6*Ym*Kzg|G59_et&-HLy}bb|M36+tN+{n zoBwBoI=Dnk`~!;q1~i|tEr&>mLKQIm0{R3Agh7N^|6l%C3{}E)g@F|&Eza@$tDs1_5ZK?&jaVB{;&Jb3}FKR>fg0scW5cV00000NkvXXu0mjf&Ha~9 diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss index 7ada5e3b8..b33378ce4 100644 --- a/app/assets/stylesheets/new-templates.css.scss +++ b/app/assets/stylesheets/new-templates.css.scss @@ -23,6 +23,10 @@ @import 'new_styles/isotope_transitions'; /* login */ +@import 'new_styles/login'; @import 'new_styles/registration'; +@import 'new_styles/forms'; + + @include video-overlay(); \ No newline at end of file diff --git a/app/assets/stylesheets/new_styles/_forms.scss b/app/assets/stylesheets/new_styles/_forms.scss new file mode 100644 index 000000000..ec1d966d0 --- /dev/null +++ b/app/assets/stylesheets/new_styles/_forms.scss @@ -0,0 +1,105 @@ +form.block-form { + display : inline-block; + + label { + color : #555; + } + + input { + &:invalid, + &:invalid:required, + &:invalid:required:focus { + -webkit-box-shadow : none; + -moz-box-shadow : none; + box-shadow : none; + box-shadow : none; + + border : none; + color : #555; + } + } + + fieldset { + @include border-radius(5px); + + -webkit-box-shadow : inset 0 1px 1px rgba(0,0,0,0.2), 0 1px 2px rgba(255,255,255,0.7); + + margin-bottom : 1em; + + background-color : #fff; + + border : 1px solid #888; + + input[type=text], + input[type=email], + input[type=password] { + @include box-shadow(0,0,0,0); + @include border-radius(0); + + background : transparent; + + padding : 10px; + + margin-bottom : 0; + border : none; + } + + /* mainly bootstrap overrides */ + .control-group { + margin : 0; + border-bottom : 1px solid #ddd; + + .control-label, + input[type=text], + input[type=password], + .field_with_errors label { + padding : 10px; + margin : 0; + } + + .controls { margin-left : 100px; position : relative; } + .control-label { width : 80px; } + + .controls .field_with_errors input { + background : { + image : image-url('invalid_fat@2x.png'); + repeat : no-repeat; + position : 197px; + size: 20px 20px; + } + } + } + } + + input[type=submit] { + text-align : center; + display : block; + width : 100%; + padding : 8px 0; + } +} + + +/* buttons to be extracted? */ +.new-btn { + @include transition(box-shadow); + @include border-radius(5px); + @include linear-gradient(#fff, rgb(233,233,233)); + @include box-shadow(0, 1px, 2px, rgba(0,0,0,0)); + + background-color : rgb(233,233,233); + color : #888; + border : 1px solid #888; + + //font-family : Roboto-Bold; + font-size : 14px; + text-shadow : 0 1px 2px #eee; + + &:hover { + @include box-shadow(0, 1px, 2px, rgba(0,0,0,0.3)); + } + + &:active { + box-shadow : inset 0 1px 3px rgba(0,0,0,0.3), 0 1px 2px rgba(255,255,255,0.7); + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/new_styles/_login.scss b/app/assets/stylesheets/new_styles/_login.scss new file mode 100644 index 000000000..b38819d2c --- /dev/null +++ b/app/assets/stylesheets/new_styles/_login.scss @@ -0,0 +1,24 @@ +#login { + position : absolute; + top : 0; + left : 0; + margin-top : 200px; + //background-color : #afc652; + min-height : 100%; + min-width : 100%; + + //color : #fff; + text-align : center; + + input[type=text], + input[type=password] { + width : 120px; + } + + #huge-text { + font-family : Roboto-Light; + font-size : 200px; + color : #ddd; + text-shadow : 0 1px 0 #fff; + } +} diff --git a/app/assets/stylesheets/new_styles/_registration.scss b/app/assets/stylesheets/new_styles/_registration.scss index f42c24862..8f15fbd74 100644 --- a/app/assets/stylesheets/new_styles/_registration.scss +++ b/app/assets/stylesheets/new_styles/_registration.scss @@ -39,100 +39,4 @@ max-width : 95%; } - - form#user_new { - display : inline-block; - - label { - color : #555; - } - - input:invalid { - color : #555; - } - - fieldset { - @include border-radius(5px); - - -webkit-box-shadow : inset 0 1px 1px rgba(0,0,0,0.2), 0 1px 2px rgba(255,255,255,0.7); - - margin-bottom : 1em; - - background-color : #fff; - - border : 1px solid #888; - - input[type=text], - input[type=email], - input[type=password] { - @include box-shadow(0,0,0,0); - @include border-radius(0); - - background : transparent; - - padding : 10px; - - margin-bottom : 0; - border : none; - } - - /* mainly bootstrap overrides */ - .control-group { - margin : 0; - border-bottom : 1px solid #ddd; - - .control-label, - input[type=text], - input[type=password], - .field_with_errors label { - padding : 10px; - margin : 0; - } - - .controls { margin-left : 100px; position : relative; } - .control-label { width : 80px; } - - .controls .field_with_errors input { - color : #f15534; - background : { - image : image-url('invalid_fat@2x.png'); - repeat : no-repeat; - position : 197px; - size: 20px 20px; - } - } - } - } - - input[type=submit] { - text-align : center; - display : block; - width : 100%; - padding : 8px 0; - } - } -} - -/* buttons to be extracted? */ -.new-btn { - @include transition(box-shadow); - @include border-radius(5px); - @include linear-gradient(#fff, rgb(233,233,233)); - @include box-shadow(0, 1px, 2px, rgba(0,0,0,0)); - - background-color : rgb(233,233,233); - color : #888; - border : 1px solid #888; - - //font-family : Roboto-Bold; - font-size : 14px; - text-shadow : 0 1px 2px #eee; - - &:hover { - @include box-shadow(0, 1px, 2px, rgba(0,0,0,0.3)); - } - - &:active { - box-shadow : inset 0 1px 3px rgba(0,0,0,0.3), 0 1px 2px rgba(255,255,255,0.7); - } } \ No newline at end of file diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index d71183ee8..791e29c8f 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -14,7 +14,7 @@ module LayoutHelper def page_title(text=nil) return text unless text.blank? - current_user ? current_user.name : t("application.helper.diaspora_alpha") + "Diaspora" end def set_asset_host diff --git a/app/views/layouts/post.html.haml b/app/views/layouts/post.html.haml index 393507864..54253bf70 100644 --- a/app/views/layouts/post.html.haml +++ b/app/views/layouts/post.html.haml @@ -16,8 +16,8 @@ %meta{:name => "MobileOptimized", :content => "320"} %meta{:name => "viewport", :content => "initial-scale=1, maximum-scale=1"} - %link{:rel => 'shortcut icon', :href => '/favicon.png'} - %link{:rel => 'apple-touch-icon', :href => '/apple-touch-icon.png'} + %link{:rel => 'shortcut icon', :href => "#{image_path('favicon.png')}" } + %link{:rel => 'apple-touch-icon', :href => "#{image_path('apple-touch-icon.png')}"} = og_site_name = chartbeat_head_block diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb index 9b0b1c469..b9421b0e4 100644 --- a/app/views/registrations/new.html.erb +++ b/app/views/registrations/new.html.erb @@ -23,7 +23,7 @@ SIGN UP - <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:class => "form-horizontal", :autocomplete => "off"}, :validate => true) do |f| %> + <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:class => "form-horizontal block-form", :autocomplete => "off"}, :validate => true) do |f| %>