From 1124ab6c871f25669f351bce7ddfe191eaec18c3 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 16 Apr 2014 17:47:40 -0700 Subject: [PATCH 1/8] Added Sass to Gemfile --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 1e8eaef1..2573bed1 100644 --- a/Gemfile +++ b/Gemfile @@ -38,6 +38,7 @@ platform :jruby do group :development do gem 'ruby-debug', require: nil + gem 'sass', require: nil end end diff --git a/Gemfile.lock b/Gemfile.lock index 23396e32..0e367264 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,6 +124,7 @@ GEM rmagick (2.13.2) rubyzip (1.1.2) safe_yaml (1.0.1) + sass (3.3.5) selenium-webdriver (2.40.0) childprocess (>= 0.5.0) multi_json (~> 1.0) @@ -216,6 +217,7 @@ DEPENDENCIES rmagick ruby-debug rubyzip + sass selenium-webdriver sequel sequel_pg From f9f90b6f6d0d8a6d50883b035c0b0d9cb4287fa8 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 16 Apr 2014 17:50:01 -0700 Subject: [PATCH 2/8] CSS and adjusted layout.erb for new dashboard design (non-dashboard pages need to be fixed) --- .../css/_project-sass/_project-Main.scss | 113 ++++++++++++++++-- views/layout.erb | 20 ++-- 2 files changed, 112 insertions(+), 21 deletions(-) diff --git a/public/assets/css/_project-sass/_project-Main.scss b/public/assets/css/_project-sass/_project-Main.scss index e010f438..d2897211 100644 --- a/public/assets/css/_project-sass/_project-Main.scss +++ b/public/assets/css/_project-sass/_project-Main.scss @@ -6,18 +6,16 @@ .content-Base{ background:#f6f0e6; min-height:500px; - padding-bottom:30px; - padding-top:20px; + padding-bottom:50px; + padding-top: 10px; h1, h2, h3, h4, h5, h6{ color:#e93250 } - - .content{ - - } } - +.content, .footer-Content { + padding: 20px 6%; +} .single-Col{ max-width:800px; } @@ -26,4 +24,103 @@ .twitter-tweet.twitter-tweet-rendered{margin:0 auto 30px!important} // Dashboard -.dash-SS{border:1px solid #ccc; background:rgba(255,255,255,.7); padding:1em; margin-bottom:20px} \ No newline at end of file +.interior .header-Outro .col.col-50.signup-Area {padding-left: 0;} +.interior .header-Outro a {color:#E93250} +.interior .signup-Area { + min-height: 164px; +} +.interior .signup-Area img { + -moz-box-shadow: 1px 2px 5px 2px rgba(0,0,0,0.10); + -webkit-box-shadow: 1px 2px 5px 2px rgba(0,0,0,0.10); + box-shadow: 1px 2px 5px 2px rgba(0,0,0,0.10); +} +.interior .header-Outro .screenshot { + width:235px;height:141px; +} +.interior .header-Outro ul { + margin:0;padding:0; +} +.interior .header-Outro ul li { + list-style: none; + font-size: 80%; + margin-bottom: 7px; +} +.interior .signup-Form fieldset { + padding: 20px; +} +.interior .header-Outro h2 { + margin-top: 12px; +} +.welcome { + background: #daeea5 url(../img/heartcat.png) no-repeat 20px 23px; + background-size: 77px 81px; + padding: 20px 20px 20px 108px; + margin-bottom: 30px; +} +.welcome h4 { + font-size: 1.2em; + margin-bottom: 4px; +} +.welcome .close { + float: right; + background: url(../img/welcome-close.png) no-repeat; + width: 19px; + height: 19px; +} +.files { + float:left; + background: #E4D8CB; + width: 100%; +} +.files .header { + background: #5E95A1; + color: #fff; + float:left; + width: 100%; + padding: 10px 20px; +} +.files .breadcrumbs { + float: left; + font-weight:bold; +} +.files .actions { + float: right; +} +.files .btn-Action { + margin-left: 8px; +} +.btn-Action span { + background-repeat: no-repeat; +} +.btn-Action.new-Page span { + background-image: url(../img/new-page.png); + background-position-y: 1px; + padding-left: 30px; +} +.btn-Action.new-Folder span { + background-image: url(../img/new-folder.png); + padding-left: 26px; +} +.files .list { + padding: 20px; +} +.files .list .upload-Boundary { + float: left; + border: 3px dashed #F6F0E6; + width: 100%; + margin: 20px 0; + padding: 20px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + background: url(../img/drag-drop.png) no-repeat center center; + min-height: 200px; +} +.site-actions { + float: left; + margin-top: 20px; + font-size: 90%; +} +.site-actions a { + color: #666; +} \ No newline at end of file diff --git a/views/layout.erb b/views/layout.erb index c91df57e..5cb23d27 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -50,21 +50,15 @@ -
- - <%= erb :'_header', layout: false %> - -
- <%= yield %> -
- -
- <%= erb :'_footer', layout: false %> -
- + <%= erb :'_header', layout: false %> + + <%= yield %>
- +
+ <%= erb :'_footer', layout: false %> +
+ From 203ad0d2d155ebff0e52d566a7223648307d2f9d Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 16 Apr 2014 17:50:51 -0700 Subject: [PATCH 3/8] dashboard.erb and related images --- public/assets/img/drag-drop.png | Bin 0 -> 3781 bytes public/assets/img/heartcat.png | Bin 0 -> 19599 bytes public/assets/img/new-folder.png | Bin 0 -> 492 bytes public/assets/img/new-page.png | Bin 0 -> 343 bytes public/assets/img/welcome-close.png | Bin 0 -> 1589 bytes views/dashboard.erb | 110 ++++++++++++++++++++++++++++ 6 files changed, 110 insertions(+) create mode 100644 public/assets/img/drag-drop.png create mode 100644 public/assets/img/heartcat.png create mode 100644 public/assets/img/new-folder.png create mode 100644 public/assets/img/new-page.png create mode 100644 public/assets/img/welcome-close.png create mode 100644 views/dashboard.erb diff --git a/public/assets/img/drag-drop.png b/public/assets/img/drag-drop.png new file mode 100644 index 0000000000000000000000000000000000000000..d7ad84f9262212b49632aa8c6aa1b05ed8dd5dec GIT binary patch literal 3781 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 literal 0 HcmV?d00001 diff --git a/public/assets/img/welcome-close.png b/public/assets/img/welcome-close.png new file mode 100644 index 0000000000000000000000000000000000000000..b72ba0552d6ca8903b43212ca3530e90221104cb GIT binary patch literal 1589 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3HQmSQK*5Dp-y;YjHK@;M7UB8wRq zxP?HN@zUM8KR`j564!{5;QX|b^2DN42FH~Aq*MjB%%art{G#k)1?OPn8Q0vHfo2JU z)J6FESS9D@>Lr4d=~d(wFxc2v6eK2RrLwc)n<$u==^2?DS(=;aC^~=l4^~#O)@{7{-4J|D#^$m>l zjf`}GDs+o0^GXscbn}XpA%?)raY-#sF3Kz@$;{7F0GXSZlwVq6tE2?72o9j0ODup} zlvfN5JYX>DS0onb8|oS8!%YTiv;hiQITxiSmgE$5enJx`6ksXI@bD@qEy@8$OG>hSYEEiyYF#zL` zPotR5H{biQx#6#H2y@h_86l2uw}tM$`r!N3+Ni7>?|-cnkd?WfHv7$lPZd|gtF|;G zZr$|w7K6pQUV*tn8sB+k`E)n^;9mN&Q{|@U`@ZbQyB0Aps+{aIu?6z- zfb>P(#&2K!SvbxFhdF5StNNdE7UpPhn;{_EaxL&#X}6@=!Dng{?3DL9+fM0vCU$dw zn1{dcCdpjkNbaK((qfulX1+Rn%{kMh8`SB-wn&q7PB2e#9Fr8C@%^=6mx dKK1?0du;h;*#{CIGJvte;OXk;vd$@?2>`&v-v + function confirmFileDelete(name) { + $('#deleteFileName').html(name); + $('#deleteConfirmModal').modal(); + } + + function fileDelete() { + $('#deleteFilenameInput').val($('#deleteFileName').html()); + $('#deleteFilenameForm').submit(); + } + + +
+
+ + + +
+

My Website

+

http://<%= current_site.username %>.neocities.org

+
    +<% if current_site.updated_at %> +
  • Last updated <%= current_site.updated_at %>
    • +<% end %> +
  • Using <%= ((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1) %>% of your <%= (Site::MAX_SPACE.to_f / 2**20).to_i %> MB of free space
    • +
  • <%= current_site.hits.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> visitors
    • +
+
+ +
+
+ +
+ +
+ +
+
+

Hello! Welcome to your new site.

+ To get started, click on the index.html file below to edit it. It's your home page! You can add more files (such as images) from your computer by dragging them into the box below. Need help building web sites? Check out these tutorials! +
+ +
+
+
Home
+
+ New Page + New Folder +
+
+
+
+ + <% current_site.file_list.each do |file| %> + + <% if file.ext.match(/jpg|png|bmp|gif/) %> + <%= file.filename %> + <% else %> + <%= file.filename %> + <% end %> + + + <% if file.ext.match(/html|htm|txt|js|css|md/) %> + + <% else %> + + <% end %> + + + <% if file.filename != 'index.html' %> + + <% else %> + + <% end %> + <% end %> +
+
+
+ +
+ + +
+ + + +
+ Allowed file types | Download entire site +
+ +
+
\ No newline at end of file From 57e2a106256ada7d300ee21f8bae0feea8c23358 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 16 Apr 2014 17:52:26 -0700 Subject: [PATCH 4/8] Edits to header css (some related to new dashboard changes) --- public/assets/css/_project-sass/_project-Header.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/assets/css/_project-sass/_project-Header.scss b/public/assets/css/_project-sass/_project-Header.scss index 3d3e75f1..b805dd5e 100644 --- a/public/assets/css/_project-sass/_project-Header.scss +++ b/public/assets/css/_project-sass/_project-Header.scss @@ -164,7 +164,7 @@ // Top nav area .header-Nav{ background:#5e95a1; - border-bottom:1px solid #a1cad4; + border-bottom:1px solid #92B4BD; @include vendor(transition, all 0.35s); @@ -279,7 +279,10 @@ // Interior CSS .interior .page{ - padding-top:46px + padding-top: 22px; +} +.interior .signup-Form { + top: 0; } .interior .header-Base{ left:0; From a3b7e33af1daf94ec711fbf49818e06265147b0b Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 16 Apr 2014 18:31:34 -0700 Subject: [PATCH 5/8] Changes to dashboard incl some initial styling/cleaning up of the file listing --- .../css/_project-sass/_project-Main.scss | 7 ++++ views/dashboard.erb | 37 +++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/public/assets/css/_project-sass/_project-Main.scss b/public/assets/css/_project-sass/_project-Main.scss index d2897211..b0802894 100644 --- a/public/assets/css/_project-sass/_project-Main.scss +++ b/public/assets/css/_project-sass/_project-Main.scss @@ -116,6 +116,13 @@ background: url(../img/drag-drop.png) no-repeat center center; min-height: 200px; } +.file { + float: left; + width: 105px; + height: 105px; + margin-right: 20px; + margin-bottom: 30px; +} .site-actions { float: left; margin-top: 20px; diff --git a/views/dashboard.erb b/views/dashboard.erb index 39f4ef0e..31d7d759 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -16,7 +16,7 @@ @@ -58,26 +58,25 @@
<% current_site.file_list.each do |file| %> - - <% if file.ext.match(/jpg|png|bmp|gif/) %> - <%= file.filename %> - <% else %> - <%= file.filename %> - <% end %> - +
+ <% if file.ext.match(/html|htm/) %> +
+ <% elsif file.ext.match(/jpg|png|bmp|gif/) %> + + <% end %> + + + <%= file.filename %> - <% if file.ext.match(/html|htm|txt|js|css|md/) %> - - <% else %> - - <% end %> + <% if file.ext.match(/txt|js|css|md/) %> + + <% end %> - - <% if file.filename != 'index.html' %> - - <% else %> - - <% end %> + + <% if file.filename != 'index.html' %> + + <% end %> +
<% end %>
From bce6da0b758f696daccb756a7c2e60a31cadadb0 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 16 Apr 2014 18:32:09 -0700 Subject: [PATCH 6/8] Changed app.rb to reference erb instead of slim for the dashboard --- app.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.rb b/app.rb index 5e4372e2..93a321d7 100644 --- a/app.rb +++ b/app.rb @@ -133,7 +133,7 @@ end get '/dashboard' do require_login - slim :'dashboard' + erb :'dashboard' end get '/signin' do From 7d1e9d5b4f54f746dcd6c19df7a898e2ae4d1dc3 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 16 Apr 2014 18:32:27 -0700 Subject: [PATCH 7/8] compressed CSS changes --- public/assets/css/neo.min.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/assets/css/neo.min.css b/public/assets/css/neo.min.css index 285f0eee..59efed85 100644 --- a/public/assets/css/neo.min.css +++ b/public/assets/css/neo.min.css @@ -5,13 +5,13 @@ .header-Base{background:#65a0ad;border-bottom:6px solid #e93250;min-height:42px;overflow:hidden}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Content{padding:0}} .blurb{background:#fff}.header-Intro{background:url(../img/neocity.jpg) 95% bottom no-repeat;min-height:214px}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Intro{-moz-background-size:cover;-ms-background-size:cover;-o-background-size:cover;-webkit-background-size:cover;background-size:cover;min-height:2px}} .header-Outro{background:#30424b -moz-linear-gradient(top, #2b3c43 0%, #354751 100%);background:#30424b -webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b3c43), color-stop(100%, #354751));background:#30424b -webkit-linear-gradient(top, #2b3c43 0%, #354751 100%);background:#30424b -o-linear-gradient(top, #2b3c43 0%, #354751 100%);background:#30424b -ms-linear-gradient(top, #2b3c43 0%, #354751 100%);background:#30424b linear-gradient(to bottom, #2b3c43 0%, #354751 100%);-moz-box-shadow:inset 0 7px 10px 0 rgba(0,0,0,0.1);-webkit-box-shadow:inset 0 7px 10px 0 rgba(0,0,0,0.1);box-shadow:inset 0 7px 10px 0 rgba(0,0,0,0.1);color:#fafafa}@media (max-device-width: 480px), screen and (max-width: 800px){.intro-List{margin-bottom:20px;padding:20px !important}}.intro-List li{padding-left:36px;padding-right:12px;margin-bottom:18px}.intro-List h2{margin-bottom:2px}.intro-List p{color:#B2BCC1}.intro-Icon{background:url(../img/icons.png) no-repeat;display:block;height:37px;left:-10px;position:absolute;top:2px;width:37px}.intro-Tools{position:relative}.intro-Question{position:relative}.intro-Question .intro-Icon{background-position:0 -40px}.signup-Area{min-height:100px;position:relative}.signup-Form{background:#354751;border-radius:4px 4px 0 0;-moz-box-shadow:1px 2px 12px 2px rgba(0,0,0,0.15);-webkit-box-shadow:1px 2px 12px 2px rgba(0,0,0,0.15);box-shadow:1px 2px 12px 2px rgba(0,0,0,0.15);height:600%;overflow:hidden;position:absolute;top:-45px;width:95%}@media (max-device-width: 480px), screen and (max-width: 800px){.signup-Form{height:auto;margin:0;overflow:visible;padding-bottom:20px;position:static;width:auto}}.signup-Form h2{margin-bottom:0;text-shadow:0 1px 1px rgba(0,0,0,0.5);font-size:1.8em}.signup-Form hr{border-bottom:1px solid #4a6677;border-top:1px solid #1d282d;margin:4px 0 22px}.signup-Form fieldset{background:url(../img/sign-up-bg.png) repeat-x center top;padding:20px 33px}.signup-Form label{color:#81b8c6}@media (max-device-width: 480px), screen and (max-width: 800px){.signup-Form label{font-size:70%}}.signup-Form .input-Area{background:#29383f;border:0 solid black;-moz-box-shadow:inset 1px 3px 10px 0px rgba(0,0,0,0.2);-webkit-box-shadow:inset 1px 3px 10px 0px rgba(0,0,0,0.2);box-shadow:inset 1px 3px 10px 0px rgba(0,0,0,0.2);color:#557380;margin-bottom:28px;margin-right:4px;padding:11px 12px 9px 12px;width:62%}.signup-Form .input-Area:focus{color:#eee}.signup-Form .btn-Action{padding:10px 25px}.small-Nav{background:#30424B;display:none;position:fixed;right:0;top:0;width:50px;z-index:9999}@media (max-device-width: 480px), screen and (max-width: 800px){.small-Nav{display:block}} -.header-Nav{background:#5e95a1;border-bottom:1px solid #a1cad4;-moz-transition:all 0.35s;-ms-transition:all 0.35s;-o-transition:all 0.35s;-webkit-transition:all 0.35s;transition:all 0.35s}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Nav{position:fixed;top:-900px !important}}.header-Nav.show-Nav{top:0 !important}.header-Nav a,.header-Nav a:visited{color:#fff;padding:8px 12px;text-decoration:none}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Nav a,.header-Nav a:visited{display:block}}.header-Nav a:hover,.header-Nav a:visited:hover{background:#528995;text-decoration:underline}.header-Nav a.selected,.header-Nav a:active,.header-Nav a:visited.selected,.header-Nav a:visited:active{background:#528995;text-decoration:underline}.constant-Nav{float:left;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.constant-Nav{float:none}.constant-Nav li{float:none}} +.header-Nav{background:#5e95a1;border-bottom:1px solid #92B4BD;-moz-transition:all 0.35s;-ms-transition:all 0.35s;-o-transition:all 0.35s;-webkit-transition:all 0.35s;transition:all 0.35s}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Nav{position:fixed;top:-900px !important}}.header-Nav.show-Nav{top:0 !important}.header-Nav a,.header-Nav a:visited{color:#fff;padding:8px 12px;text-decoration:none}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Nav a,.header-Nav a:visited{display:block}}.header-Nav a:hover,.header-Nav a:visited:hover{background:#528995;text-decoration:underline}.header-Nav a.selected,.header-Nav a:active,.header-Nav a:visited.selected,.header-Nav a:visited:active{background:#528995;text-decoration:underline}.constant-Nav{float:left;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.constant-Nav{float:none}.constant-Nav li{float:none}} .status-Nav{float:right}@media (max-device-width: 480px), screen and (max-width: 800px){.status-Nav{float:none}}.status-Nav li{float:left}@media (max-device-width: 480px), screen and (max-width: 800px){.status-Nav li{float:none}} .hp .header-Base{padding-top:46px}.hp .header-Nav{left:0;position:fixed;top:0;width:100%;z-index:3}.hp .hp-Logo{left:-90px;position:fixed;-moz-transition:all 0.35s;-ms-transition:all 0.35s;-o-transition:all 0.35s;-webkit-transition:all 0.35s;transition:all 0.35s}.hp .hp-Logo.in-View{left:0 !important;z-index:99}@media (max-device-width: 480px), screen and (max-width: 800px){.hp .hp-Logo.in-View{left:-90px !important}} .hp .logo{padding-top:45px}@media (max-device-width: 480px), screen and (max-width: 800px){.hp .logo{padding-left:20px;padding-right:20px}} .constant-Nav{margin-left:-88px;-moz-transition:all 0.35s;-ms-transition:all 0.35s;-o-transition:all 0.35s;-webkit-transition:all 0.35s;transition:all 0.35s}@media (max-device-width: 480px), screen and (max-width: 800px){.constant-Nav{margin-left:0}}.constant-Nav.in-View{margin-left:0;padding-left:70px}@media (max-device-width: 480px), screen and (max-width: 800px){.constant-Nav.in-View{padding-left:0}} .add-Stripe{border-bottom:6px solid #E93250}@media (max-device-width: 480px), screen and (max-width: 800px){.add-Stripe{border:0}} -.interior .page{padding-top:46px}.interior .header-Base{left:0;overflow:visible;position:fixed;top:0;width:100%;z-index:9}.int-Logo{left:0;position:absolute;top:0;width:70px;z-index:9}.interior .header-Nav{padding-left:70px}@media (max-device-width: 480px), screen and (max-width: 800px){.interior .header-Nav{width:100%}} -.interior .constant-Nav{margin:0}.content-Base{background:#f6f0e6;min-height:500px;padding-bottom:30px;padding-top:20px}.content-Base h1,.content-Base h2,.content-Base h3,.content-Base h4,.content-Base h5,.content-Base h6{color:#e93250}.single-Col{max-width:800px}.twitter-tweet.twitter-tweet-rendered{margin:0 auto 30px !important}.dash-SS{border:1px solid #ccc;background:rgba(255,255,255,0.7);padding:1em;margin-bottom:20px}.footer-Base{color:#5e5b56}.footer-Base h1,.footer-Base h2,.footer-Base h3,.footer-Base h4{color:#8b9a7a}.footer-Intro{background:#daeea5;border-top:1px solid #cedbab;-moz-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);-webkit-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);position:relative}.footer-Intro .footer-Content{padding-top:40px;padding-bottom:40px}.f-Col{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;min-height:125px;padding-bottom:28px;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col{min-height:2px;padding-left:15px !important;padding-right:100px !important}}.f-Col .action-Link{bottom:0;position:absolute;right:12px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col .action-Link{position:static}} +.interior .page{padding-top:22px}.interior .signup-Form{top:0}.interior .header-Base{left:0;overflow:visible;position:fixed;top:0;width:100%;z-index:9}.int-Logo{left:0;position:absolute;top:0;width:70px;z-index:9}.interior .header-Nav{padding-left:70px}@media (max-device-width: 480px), screen and (max-width: 800px){.interior .header-Nav{width:100%}} +.interior .constant-Nav{margin:0}.content-Base{background:#f6f0e6;min-height:500px;padding-bottom:50px;padding-top:10px}.content-Base h1,.content-Base h2,.content-Base h3,.content-Base h4,.content-Base h5,.content-Base h6{color:#e93250}.content,.footer-Content,.footer-Content{padding:20px 6%}.single-Col{max-width:800px}.twitter-tweet.twitter-tweet-rendered{margin:0 auto 30px !important}.interior .header-Outro .col.col-50.signup-Area{padding-left:0}.interior .header-Outro a{color:#E93250}.interior .signup-Area{min-height:164px}.interior .signup-Area img{-moz-box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1);-webkit-box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1);box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1)}.interior .header-Outro .screenshot{width:235px;height:141px}.interior .header-Outro ul{margin:0;padding:0}.interior .header-Outro ul li{list-style:none;font-size:80%;margin-bottom:7px}.interior .signup-Form fieldset{padding:20px}.interior .header-Outro h2{margin-top:12px}.welcome{background:#daeea5 url(../img/heartcat.png) no-repeat 20px 23px;background-size:77px 81px;padding:20px 20px 20px 108px;margin-bottom:30px}.welcome h4{font-size:1.2em;margin-bottom:4px}.welcome .close{float:right;background:url(../img/welcome-close.png) no-repeat;width:19px;height:19px}.files{float:left;background:#E4D8CB;width:100%}.files .header{background:#5E95A1;color:#fff;float:left;width:100%;padding:10px 20px}.files .breadcrumbs{float:left;font-weight:bold}.files .actions{float:right}.files .btn-Action{margin-left:8px}.btn-Action span{background-repeat:no-repeat}.btn-Action.new-Page span{background-image:url(../img/new-page.png);background-position-y:1px;padding-left:30px}.btn-Action.new-Folder span{background-image:url(../img/new-folder.png);padding-left:26px}.files .list{padding:20px}.files .list .upload-Boundary{float:left;border:3px dashed #F6F0E6;width:100%;margin:20px 0;padding:20px;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;background:url(../img/drag-drop.png) no-repeat center center;min-height:200px}.file{float:left;width:105px;height:105px;margin-right:20px;margin-bottom:30px}.site-actions{float:left;margin-top:20px;font-size:90%}.site-actions a{color:#666}.footer-Base{color:#5e5b56}.footer-Base h1,.footer-Base h2,.footer-Base h3,.footer-Base h4{color:#8b9a7a}.footer-Intro{background:#daeea5;border-top:1px solid #cedbab;-moz-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);-webkit-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);position:relative}.footer-Intro .footer-Content{padding-top:40px;padding-bottom:40px}.f-Col{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;min-height:125px;padding-bottom:28px;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col{min-height:2px;padding-left:15px !important;padding-right:100px !important}}.f-Col .action-Link{bottom:0;position:absolute;right:12px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col .action-Link{position:static}} .footer-icon{background-repeat:no-repeat;position:absolute;right:0;top:-70px}@media (max-device-width: 480px), screen and (max-width: 800px){.footer-icon{-moz-background-size:100%;-ms-background-size:100%;-o-background-size:100%;-webkit-background-size:100%;background-size:100%;height:90px !important;top:0;width:77px !important}} .f-Col-1{padding-right:12px}.f-Col-1 .footer-icon{background-image:url(../img/support-us.png);height:104px;right:5px;width:92px}.f-Col-2{padding-left:15px;padding-right:6px;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col-2{border-bottom:1px solid rgba(0,0,0,0.1);border-top:1px solid rgba(0,0,0,0.1);margin:20px 0;overflow:hidden;padding:20px 0}.f-Col-2 .footer-icon{top:14px}}.f-Col-2:before,.f-Col-2:after{background:url("../img/border.png") no-repeat 0 -20px;content:"";height:200px;opacity:0.2;position:absolute;top:0;width:1px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col-2:before,.f-Col-2:after{display:none}}.f-Col-2:before{left:-14px}.f-Col-2:after{right:-14px}.f-Col-2 .footer-icon{background-image:url(../img/about-neocities.png);width:100px;height:106px}.f-Col-3{padding-left:20px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col-3{padding-left:0}}.f-Col-3 .footer-icon{background-image:url(../img/latest-news.png);height:103px;width:134px}.footer-Outro{background:#ccdf9b;border-top:1px solid #b3c388;overflow:hidden}.footer-Outro a{color:#5e5b56}.credits{margin-bottom:0}.footer-Nav{text-transform:uppercase}.footer-Nav .h-Nav,.footer-Nav .bread{float:right}@media (max-device-width: 480px), screen and (max-width: 800px){.footer-Nav .h-Nav,.footer-Nav .bread{float:none;margin-top:15px}.footer-Nav .h-Nav li:first-child a,.footer-Nav .bread li:first-child a{padding-left:0}}.footer-Nav .h-Nav a,.footer-Nav .bread a{padding:0 8px}.footer-Nav .h-Nav li:last-child a,.footer-Nav .bread li:last-child a{padding-right:0}.alert{background-color:#F39C12;color:#fff}.website-Gallery{list-style:none;padding:10px 0}.website-Gallery li{float:left;margin-bottom:8px}@media (max-device-width: 480px), screen and (max-width: 800px){.website-Gallery li{width:50%}}.website-Gallery a{padding:0 8px;display:block}.website-Gallery.int-Gall li{border:1px solid #ccc;margin:0 .5% 12px;width:24%}@media (max-device-width: 480px), screen and (max-width: 800px){.website-Gallery.int-Gall li{width:49%}}.website-Gallery.int-Gall li a{padding:8px}.neo-SS,.neo-Screen-Shot{background:#fff;-moz-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);-webkit-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);display:block;height:auto !important;padding:8px;position:relative;width:100%}.img-Holder{-moz-background-size:cover !important;-webkit-background-size:cover !important;background-size:cover !important;display:block}.hp-Gallery img,.neo-Screen-Shot img{width:100%} From 7b6f796ecbaf9a360411b2a8899e5c731c00995d Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 16 Apr 2014 22:27:23 -0700 Subject: [PATCH 8/8] CSS for files in file listing, with edit/delete overlay. --- .../css/_project-sass/_project-Main.scss | 50 +++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/public/assets/css/_project-sass/_project-Main.scss b/public/assets/css/_project-sass/_project-Main.scss index b0802894..42bf0572 100644 --- a/public/assets/css/_project-sass/_project-Main.scss +++ b/public/assets/css/_project-sass/_project-Main.scss @@ -82,6 +82,7 @@ .files .breadcrumbs { float: left; font-weight:bold; + margin-top: 4px; } .files .actions { float: right; @@ -114,14 +115,57 @@ -moz-border-radius: 8px; border-radius: 8px; background: url(../img/drag-drop.png) no-repeat center center; - min-height: 200px; + min-height: 300px; } .file { float: left; - width: 105px; - height: 105px; +// width: 115px; + padding: 5px; margin-right: 20px; margin-bottom: 30px; + text-align: center; + display:block;position:relative; +} +.file .title { + font-weight: bold; + font-size: 12px; + color: #666; + text-decoration: none; +} +.html-thumbnail { + -webkit-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3); + -moz-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3); + box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3); + font-size: 11px; + margin-top: 5px; + margin-left: 10px; + display:block;position:relative; +} +.overlay a { + color: white; + text-decoration: none; +} +.overlay { + position:absolute; + top:0; + width:0; + width:100%; + height:100%; + background-color:rgba(0, 0, 0, 0.5); + display:none; +} +.file > .overlay { + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + padding-top: 15px; + background-color:rgba(0, 0, 0, 0.15); +} +.overlay i { + font-weight: bold; +} +.filehover:hover .overlay, .fileimagehover:hover .overlay { + display:block; } .site-actions { float: left;