Merge branch 'master' of github.com:neocities/neocities

sass/_project-sass/_project-Main.scss

@@ -110,20 +110,46 @@
 .interior .header-Outro .col.col-50.signup-Area {
   padding-left: 0;
 }
-.interior .header-Outro.dashboard .col.col-50.signup-Area {
+.interior .header-Outro.dashboard {
-  width: 293px!important;
+  .col.col-50.signup-Area {
-  float: left;
+    width: 293px!important;
+    float: left;
+  }
+  .site-url {
+    margin-top: -9px;
+  } 
+  .btn-Action {
+    font-weight: normal;
+    font-size: 12px;
+    padding: 7px 15px;
+    
+    @media (max-device-width:480px), screen and (max-width:800px) {
+      margin: 6px 0px 8px;
+    }
+  }
+  .row.content {
+    margin-left: 6%;
+    margin-right: 6%; 
+  }
 }
 .interior .header-Outro a {color:#E93250}
 .interior .header-Outro .btn-Action {color:#fff}
 .interior .signup-Area {
   min-height: 164px;
+
+  @media (max-device-width:480px), screen and (max-width:800px) {
+    margin: 0 auto;
+  }
 }
 .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);
   border: 4px solid white;
+  
+  @media (max-device-width:480px), screen and (max-width:800px) {
+    margin: 0 auto;
+  }
 }
 .interior .header-Outro .screenshot {
   width: 357px;
@@ -143,7 +169,7 @@
 .interior .header-Outro .screenshot.dashboard {
   width: 249px;
   background-size: 249px;
-  height: 143px;
+  height: 156px;
 }
 .interior .header-Outro ul {
   margin:0;padding:0;
@@ -174,15 +200,21 @@
   float: left;
   
   @media (max-device-width: 480px), screen and (max-width: 800px) {
-    width: 42%!important;
     margin-left: 22px;
+    margin-top: 18px;
   }
 }
 .welcome {
-  background: #daeea5 url(/img/heartcat.png) no-repeat 20px center;
+  background: #daeea5 url(/img/heartcat.png) no-repeat;
+  background-position:  20px center;
   background-size: 77px 81px;
   padding: 20px 20px 20px 111px;
   margin-bottom: 13px;
+  
+  @media (max-device-width: 480px), screen and (max-width: 800px) {
+    padding: 111px 20px 20px 20px;
+    background-position: center 20px;
+  }
 }
 .welcome h4 {
   font-size: 1.2em;
@@ -225,6 +257,10 @@
 }
 .files .btn-Action {
   margin-left: 8px;
+  
+  @media (max-device-width:480px), screen and (max-width:800px) {
+    margin: 4px 8px 4px 0;
+  }
 }
 .files .list {
   padding: 20px;
@@ -242,6 +278,10 @@
 }
 .files .list .upload-Boundary.with-instruction {
   background: url(/img/drag-drop.png) no-repeat center center;
+  
+  @media (max-device-width:480px), screen and (max-width:800px) {
+    background: 0;
+  }
 }
 .files .uploading-overlay {
   width: 100%;
@@ -1745,4 +1785,15 @@ a.tag:hover {
   blockquote:before, blockquote:after {
     content: none;
   }
+}
+.hide-on-mobile {
+  @media (max-device-width:480px), screen and (max-width:800px) {
+    display: none;
+  }
+}
+.show-on-mobile {
+  display: none;
+  @media (max-device-width:480px), screen and (max-width:800px) {
+    display: inline;
+  }
 }

views/browse.erb

@@ -21,7 +21,7 @@
     <form id="search_criteria" action="/browse" method="GET">
       <div class="col col-50 filter">
         <fieldset class="grouping">
-          <label class="text-Label" for="sort_by">Sort By:</label>
+          <label class="text-Label" for="sort_by">Sort by:</label>
           <div class="select-Container">
             <select name="sort_by" id="sort_by" class="input-Select">
               <option value="last_updated" <%= params[:sort_by] == 'last_updated' ? 'selected' : '' %>>Last Updated</option>
@@ -43,7 +43,7 @@
       <div class="col col-50 filter">
         <form method="GET" action="browse">
         <fieldset class="grouping">
-        <label class="text-Label" for="tag">Search by tag:</label>
+        <label class="text-Label" for="tag"><span class="hide-on-mobile">Search by </span>Tag:</label>
         <input class="input-Area typeahead" id="tag" name="tag" type="text" placeholder="pokemon" value="<%= params[:tag] %>" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" dir="auto">
         <input style="vertical-align: -4px;margin-left: 4px;" type="submit" class="btn-Action" value="Search">
         </fieldset>
@@ -79,11 +79,15 @@
           </div>
           <div class="site-stats">
             <a href="/site/<%= site.username %>">
+              <span class="show-on-mobile">
+                <i class="fa fa-eye"></i>
+              </span>
               <% if params[:sort_by] == 'hits' %>
-                <%= site.hits.format_large_number %>&nbsp;hit<%= site.hits == 1 ? '' : 's' %>
+                <%= site.hits.format_large_number %><span class="hide-on-mobile">&nbsp;hit<%= site.hits == 1 ? '' : 's' %></span>
               <% else %>
-                <%= site.views.format_large_number %>&nbsp;view<%= site.views == 1 ? '' : 's' %>
+                <%= site.views.format_large_number %><span class="hide-on-mobile">&nbsp;view<%= site.views == 1 ? '' : 's' %></span>
               <% end %>
+
             </a>
           </div>
           <div class="site-tags">

views/dashboard.erb

@@ -29,7 +29,10 @@
 
 	<div class="col col-50">
     <h2 class="eps"><%= current_site.title %></h2>
-    <p class="site-url" style="margin-top: -9px;"><a href="//<%= current_site.host %>" target="_blank"><%= current_site.host %></a></p>
+    <p class="site-url">
+      <a href="//<%= current_site.host %>" target="_blank"><%= current_site.host %></a>
+      <a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site} %>'><i class="fa fa-share-alt"></i> <span>Share</span></a>
+    </p>
 	<ul>
 <% if current_site.site_updated_at %>
 	<li>Last updated <%= current_site.site_updated_at.ago.downcase %></li>

views/home.erb

@@ -66,7 +66,8 @@
                 </div>
                 <div class="site-stats">
                   <a href="/site/<%= suggested_site.username %>">
-                      <%= suggested_site.views.format_large_number %>&nbsp;view<%= suggested_site.views == 1 ? '' : 's' %>
+                    <span class="show-on-mobile"><i class="fa fa-eye"></i></span>
+                    <%= suggested_site.views.format_large_number %><span class="hide-on-mobile">&nbsp;view<%= suggested_site.views == 1 ? '' : 's' %></span>
                   </a>
                 </div>
                 <div class="site-tags">

views/site_files/text_editor.erb

@@ -71,8 +71,9 @@
       </div>
       <a id="saveButton" class="btn btn-Action" href="#" onclick="saveTextFile(false); return false" style="opacity: 0.5"><i class="fa fa-save"></i>Save</a>
       <a class="btn btn-Action" href="//<%= current_site.host %>/<%= @filename %>" target="_blank">View</a>
+      <a href="#" id="shareButton" class="btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site} %>'>Share</a>
     <!-- <a id="saveAndExitButton" class="btn-Action" href="#" onclick="saveTextFile(true); return false" style="opacity: 0.5"><i class="fa fa-save"></i>&nbsp;&nbsp;Save and Exit</a> -->
-      <div id="editorUpdates" class="tooltip fade bottom in hidden" style="top: 90px;right: 46px;">
+      <div id="editorUpdates" class="tooltip fade bottom in hidden" style="top: 90px;right: 12.5em;">
         <div class="tooltip-arrow"></div>
         <div class="tooltip-inner">
           <span></span>