From de48a1ff353e69f86243840c4bf5316165f914c5 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 13 Aug 2014 19:24:12 -0700 Subject: [PATCH 1/5] Fixed incorrectly aligned header --- views/site_files/text_editor.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb index 8cf5822d..ef28662e 100644 --- a/views/site_files/text_editor.erb +++ b/views/site_files/text_editor.erb @@ -14,7 +14,7 @@
-
+

Editing <%= params[:filename] %>

From 6fe7db054b7ed9494f815ee4f9fa586bbf59a93b Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Wed, 13 Aug 2014 19:24:41 -0700 Subject: [PATCH 2/5] Added "New Site" to interior top bar when not logged in --- views/_header.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/views/_header.erb b/views/_header.erb index b7c43963..35e74557 100644 --- a/views/_header.erb +++ b/views/_header.erb @@ -26,6 +26,9 @@
    <% if !signed_in? %> +
  • + New Site +
    • From c989819328fc0818859d53a20f9c49c92ec012dc Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Thu, 14 Aug 2014 20:55:03 -0700 Subject: [PATCH 3/5] Fix typo --- views/layout.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/layout.erb b/views/layout.erb index 012eca2a..42ce089f 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -4,7 +4,7 @@ <%= title %> - + From 545652722e6b9f5323dec20fb68a2981488b9f7c Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Thu, 14 Aug 2014 20:56:45 -0700 Subject: [PATCH 4/5] UI changes to Browse page --- public/assets/css/_base-sass/_forms.scss | 4 +- .../css/_project-sass/_project-Main.scss | 25 ++++ .../_project-Website-Gallery.scss | 28 ++-- public/assets/css/neo.css | 57 ++++++-- views/browse.erb | 130 ++++++++---------- 5 files changed, 146 insertions(+), 98 deletions(-) diff --git a/public/assets/css/_base-sass/_forms.scss b/public/assets/css/_base-sass/_forms.scss index 26c6f3ec..1de460cc 100644 --- a/public/assets/css/_base-sass/_forms.scss +++ b/public/assets/css/_base-sass/_forms.scss @@ -81,9 +81,9 @@ legend, .legend{ /* Drop Down Selection Inputs */ .select-Container{ @extend %input-Area; - background:url(../img/drop-Arrow.png) no-repeat 99% center #fff; display:inline-block; overflow:hidden; + background:url(../img/drop-Arrow.png) no-repeat 99% center #fff; display:inline-block; } -.input-Select{background:none; border:0; font-size:$base; padding-right:$spacing*4; width:120%; -webkit-appearance:textarea} +.input-Select{background:none; border:0; font-size:$base; padding-right:$spacing*4; width:100%; -webkit-appearance:textarea} // File Input Styling .file-Input-Area{ diff --git a/public/assets/css/_project-sass/_project-Main.scss b/public/assets/css/_project-sass/_project-Main.scss index 4dd7a747..962a9db2 100644 --- a/public/assets/css/_project-sass/_project-Main.scss +++ b/public/assets/css/_project-sass/_project-Main.scss @@ -781,4 +781,29 @@ a.tag:hover { .tt-dropdown-menu { padding: 0px 10px 0px 10px; background: #FFFFFF; +} +.browse-page .select-Container { + overflow: none!important; + padding: 2px 4px; + width: 40%; +} +.browse-page .input-Area { + width: 100%; + padding: 5px 5px; +} +.header-Outro .btn-Action { + margin: 0 0 0 10px; +} +.browse-page .text-Label { + float: left; + margin-right: 5px; + font-weight: bold; + line-height:31px; +} +.browse-page h1 { + margin-top: 0; +} +.interior .header-Outro.with-columns .col.filter { + padding-top: 0px; + padding-bottom: 4px; } \ No newline at end of file diff --git a/public/assets/css/_project-sass/_project-Website-Gallery.scss b/public/assets/css/_project-sass/_project-Website-Gallery.scss index aeef8a84..2173fea7 100644 --- a/public/assets/css/_project-sass/_project-Website-Gallery.scss +++ b/public/assets/css/_project-sass/_project-Website-Gallery.scss @@ -4,7 +4,7 @@ .website-Gallery{ list-style:none; - padding:10px 0; + padding:30px 20px; li{ @extend .col-25; @@ -16,34 +16,42 @@ } } - a{ - padding:0 $spacing*2; + li a { display:block; } + .site-info a { + color: #666; + font-size: 80%; + } + .title { + margin-top: 8px; + margin-bottom: 2px; + } &.int-Gall{ li{ - border:1px solid #ccc; + margin:0 .5% 12px; width:24%; + background-color: white; + border: 9px solid white; + -moz-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); + box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); + @media (max-device-width:480px), screen and (max-width:800px){ width:49% } - a{ - padding:8px; - } } } } .neo-SS, .neo-Screen-Shot{ - background:#fff; - @include box-shadow($bs-4); + border: 1px solid #eee; display:block; height:auto!important; - padding:$spacing*2; position:relative; width:100%; } diff --git a/public/assets/css/neo.css b/public/assets/css/neo.css index fe6593c7..b4f9fc3a 100644 --- a/public/assets/css/neo.css +++ b/public/assets/css/neo.css @@ -405,15 +405,14 @@ legend, .legend { /* Drop Down Selection Inputs */ .select-Container { background: url(../img/drop-Arrow.png) no-repeat 99% center white; - display: inline-block; - overflow: hidden; } + display: inline-block; } .input-Select { background: none; border: 0; font-size: 0.9em; padding-right: 16px; - width: 120%; + width: 100%; -webkit-appearance: textarea; } .file-Input-Area { @@ -2017,6 +2016,31 @@ a.tag:hover { padding: 0px 10px 0px 10px; background: #FFFFFF; } +.browse-page .select-Container { + overflow: none !important; + padding: 2px 4px; + width: 40%; } + +.browse-page .input-Area { + width: 100%; + padding: 5px 5px; } + +.header-Outro .btn-Action { + margin: 0 0 0 10px; } + +.browse-page .text-Label, .browse-page .option-Container { + float: left; + margin-right: 5px; + font-weight: bold; + line-height: 31px; } + +.browse-page h1 { + margin-top: 0; } + +.interior .header-Outro.with-columns .col.filter { + padding-top: 0px; + padding-bottom: 4px; } + .footer-Base { color: #5e5b56; float: left; @@ -2162,34 +2186,37 @@ a.tag:hover { .website-Gallery { list-style: none; - padding: 10px 0; } + padding: 30px 20px; } .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; + .website-Gallery li a { display: block; } + .website-Gallery .site-info a { + color: #666; + font-size: 80%; } + .website-Gallery .title { + margin-top: 8px; + margin-bottom: 2px; } .website-Gallery.int-Gall li { - border: 1px solid #ccc; margin: 0 .5% 12px; - width: 24%; } + width: 24%; + background-color: white; + border: 9px solid white; + -moz-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); + box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); } @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); + border: 1px solid #eee; display: block; height: auto !important; - padding: 8px; position: relative; width: 100%; } diff --git a/views/browse.erb b/views/browse.erb index 116defbc..45c68c81 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -4,58 +4,59 @@ } -
    +
    - <% if params[:tag] %> -

    Sites tagged <%= params[:tag] %> - <% else %> -

    Sites on Neocities

    - <% end %> -

    +
    + <% if params[:tag] %> +

    Sites tagged <%= params[:tag] %>

    + <% else %> +

    Sites on Neocities

    + <% end %> +
    + +
    +
    +
    + <% if params[:tag] %> + + <% end %> + +
    + +
    + + +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    -
    -
    -
    -
    - <% if params[:tag] %> - - <% end %> - -
    - -
    - -
    - -
    -
    -
    -
    +
    -
    -

    If you like a site, don't forget to follow it!
    Visitor counts are updated hourly.

    - <% unless signed_in? %> - Create your Neocities site now - <% end %> -
    -
    - -
    <% if @sites.length == 0 %> -
    +

    No active sites found.
    Try another search!

    <% else %> @@ -67,20 +68,18 @@ <%= site.title %> -
    - -
    <%= site.title.shorten(35) %> - +
    + <%= site.title.shorten(35) %>
    -
    - - Profile - - +
    + +
    <% end %> @@ -109,22 +108,11 @@ <% end %> <% end %> -
    -
    -

    +
    +

    Tags

    +

    <% Tag.popular_names.each do |tag| %> <%= tag[:name] %>   <% end %> -

    -
    -
    - -
    -
    -

    Search by tag:

    -
    - - -
    -
    +

    \ No newline at end of file From 576b0037ff8ebac99cb1633bc27c12381dab2ef4 Mon Sep 17 00:00:00 2001 From: Victoria Wang Date: Thu, 14 Aug 2014 22:00:31 -0700 Subject: [PATCH 5/5] Added html/image for folder support --- .../assets/css/_project-sass/_project-Main.scss | 7 +++++++ public/assets/css/neo.css | 8 ++++++++ public/assets/img/folder.png | Bin 0 -> 2044 bytes views/dashboard.erb | 10 ++++++++-- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 public/assets/img/folder.png diff --git a/public/assets/css/_project-sass/_project-Main.scss b/public/assets/css/_project-sass/_project-Main.scss index 962a9db2..23d8017c 100644 --- a/public/assets/css/_project-sass/_project-Main.scss +++ b/public/assets/css/_project-sass/_project-Main.scss @@ -301,6 +301,13 @@ margin-left: auto; margin-right: auto; } +.folder-icon { + background: url(../img/folder.png) no-repeat 0px 0px; + width: 95px; + height: 65px; + display: block; + padding-top: 35px; +} .overlay a { color: white; text-decoration: none; diff --git a/public/assets/css/neo.css b/public/assets/css/neo.css index b4f9fc3a..828be8d9 100644 --- a/public/assets/css/neo.css +++ b/public/assets/css/neo.css @@ -1545,6 +1545,14 @@ a { margin-left: auto; margin-right: auto; } +.folder-icon { + background: url(../img/folder.png) no-repeat 0px 0px; + width: 95px; + height: 65px; + display: block; + padding-top: 35px; + font-size: 14px; } + .overlay a { color: white; text-decoration: none; diff --git a/public/assets/img/folder.png b/public/assets/img/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..7f76ab0e0f53560198c2932563c2541198d168ee GIT binary patch literal 2044 zcmcIlYfw{16uuNt9?b{}h(Ps{(u$AdCYM0S6L|)#AWCYfiX zfJLQ59*#ARR$43;go+^efT=LifdLIFI9LS*MPU#f5PJg(>U7#)?#%AlJ@b9%oc+$u zY<6S>k6`0s0{{RaEHr36Ze#K3Z#4&BtM_RaBdJDJlo~QW*l!A(#PCy*AAkbl?Ct6CeteU>czk0sO^i90G<& zm52saCaS=|D6hiK5OX}4y$Kf`zJ@76Wn`fVM%Ky{0NYQi5Q-8J42(nKrE(4t1VJJw z6?2GRd52TN6@f^CG&DttM5RRVMJb6QhM4HbwP9!bWPFWkzgRIL_ivuN)l1LXdump4AWr--Df2jCB(qhLOBT2L6}0p7nn(< zGHF!2n5jYJ+TfP06ib-vgF;^C#7`Vz0){D=5Twy)$Qmy)s*H!I3_6hOC2T z2Q9O!%*_|L24rSCQY#u_8w{N}83vGQ77!ZRU={jg9ylkcgHQ7uZEg`9-Z2TTZo6gN z+I<*Ps?_@S{l|yuG-qNnjCQZ2l-xg7HC2=+yLex$+L!>zV9p`G26n;`5wI?0Z;q-2 z+3>XPhpVONcu~9`IR!+=O67I8b_~0&DpX(YuX)~m;JQ@PQlEamG$$izXmc$=K*)A? zdb*?|Wli7O-M5*op2mTgYU(~h&v|RX!VYcEXJbVwH;>(0&$(Six*UMfgrUnN?Jp+@ zu1AOUx7gLmlcRkaG;PuClq6+#QDaOr##WaX;n}JuX5R(QHJ{?T(dlP8?lc+>n&p2-w6II;YYE|1F^gB{S?t8LI-dby zM991lpXT1$;Ku0Uhx{lz(s=P1hyKC!z@YZJgHx`NxTj>Obo0dLyo#U2y*&RXUoKCs z_^T1q3D}cc9=G={uqPN_KFjLuw>!4o@kNu%x;AH)N0*buhO5u4O$-~K)l(`Y~!4yN)Ht>_}$tWk2y9vAdBxv+Z3 zzf@XgFz(kb9XEsf@?Pb3pDJtYkTkXLm~}wcIHjvN{>&V|+olV9;1LPpE}l zqQOvYb#Lvmcosu9a@W(v$LrS)@Z-#j%2=n7yj^o+JLlHlwExX++%G+K#Te3S>z-A8 z;E_AH+_6&oh0&hx>(O7d>=MMgvFpl`z4WLn$93PsPbD_29(ZD7WG$t5p1MB#8$Hs; zii>OQWA~5)_$%(+-_8>B-MkdViMdfee9a+jnMhsF(ev$xuVh;6Y|YQL2@AgN{dZLZ zhImN0R@rylcLEJty8?h8)%E3L&d#ydM!j|Wj|@m3=I83hN9H0Uww2FIP9cL?XO};) n;FmR#Pm;O&Bh%nNuT7ds^a5Gh1$_bj5d&et5kchvg3NyabgRzi literal 0 HcmV?d00001 diff --git a/views/dashboard.erb b/views/dashboard.erb index a96cf24b..50df31bc 100644 --- a/views/dashboard.erb +++ b/views/dashboard.erb @@ -88,10 +88,10 @@
    -
    My Files
    +
    Home
    New Page - + New Folder Upload
    @@ -112,6 +112,12 @@
    + <% else %>
    <%= file.ext %>