Home Explore Help
Sign In
douglas
/
flickrlicense
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Move inline style attributes to stylesheet

Douglas Thrift 6 years ago
parent
c6ee8ef62e
commit
cdb3d1ba57
3 changed files with 18 additions and 3 deletions
Split View Show Diff Stats
  1. 1 1
      public/js/app.js
  2. 1 1
      views/index.erb
  3. 16 1
      views/layout.erb

+ 1 - 1
public/js/app.js
View File 

@@ -130,7 +130,7 @@ $(function() {
 
         if (request.responseJSON && request.responseJSON.error) {
 
             errorTag.text(request.responseJSON.error);
 
         } else {
 
-            errorTag.empty().append($('<div>').text(request.status + ' ' + error), $('<iframe>', {style: 'height: 100%; width: 100%;', srcdoc: request.responseText}));
 
+            errorTag.empty().append($('<div>').text(request.status + ' ' + error), $('<iframe>', {srcdoc: request.responseText}));
 
         }
 
         errorTag.dialog('open');
 
     });

+ 1 - 1
views/index.erb
View File 

@@ -20,7 +20,7 @@
 
     </select>
 
 </div>
 
 
-<div grid id="photos" style="height: 66vh; overflow-y: auto;">
 
+<div grid id="photos">
 
     <div class="spinner"></div>
 
 </div>

+ 16 - 1
views/layout.erb
View File 

@@ -15,6 +15,21 @@
 
         <link href="https://cdn.rawgit.com/cc-icons/cc-icons/1.2.1/css/cc-icons.min.css" rel="stylesheet">
 
 
         <style>
 
+        .flickrblue {
 
+            color: #0063dc;
 
+        }
 
+        .flickrpink {
 
+            color: #ff0084;
 
+        }
 
+        #error iframe {
 
+            height: 100%;
 
+            width: 100%;
 
+        }
 
+        #photos {
 
+            height: 66vh;
 
+            overflow-y: auto;
 
+        }
 
+        /* work around the '*+* { margin-top: 1.5rem; }' rule from Concise CSS that interferes with CC Icons */
 
         i.cc {
 
             margin-top: 0px;
 
         }
 
@@ -23,7 +38,7 @@
 
     <body>
 
         <header container>
 
             <div grid="center">
 
-                <div column><span style="color: #0063dc;">flick</span><span style="color: #ff0084;">r</span> license</div>
 
+                <div column><span class="flickrblue">flick</span><span class="flickrpink">r</span> license</div>
 
                 <div column style="text-align: right;"><a href="<%= @user.photosurl %>"><img src="<%= @user.buddyicon %>"> <%= @user.username %></a> <% if @user.fullname && !@user.fullname.empty? %>(<%= @user.fullname %>)<% end %> | <a href="/logout">logout</a></div>
 
             </div>
 
         </header>