Merge conflicts resolved.

metacpan · Aug 19, 2014 · 8a31570 · 8a31570
1 parent b6da287
commit 8a31570
Showing 1 changed file with 36 additions and 82 deletions.
diff --git a/root/static/css/style.css b/root/static/css/style.css
@@ -67,23 +67,6 @@ label input[type="text"], label select {
     font-weight: bold;
 }
 
-.big-logo {
-    margin: 42px auto 44px auto;
-    display: block;
-    width: 322px;
-    height: 58px;
-    background: transparent url('/static/images/logo.png') no-repeat -1px -1px;
-}
-
-.small-logo {
-    position: relative;
-    margin: 0 12px 0 0;
-    float: left;
-    width: 180px;
-    height: 34px;
-    background: transparent url('/static/images/logo.png') no-repeat -1px -68px;
-}
-
 button.favorite, a.favorite {
     padding: 1px 3px;
     margin-left: 5px;
@@ -140,66 +123,6 @@ button.favorite:hover, button.favorite.active, a.favorite.active, a.favorite:hov
     text-decoration: none;
 }
 
-button.stargazer, a.stargazer {
-    padding: auto;
-    margin-left: 5px;
-    font-size: 0.9em;
-    background-color: #fff;
-    opacity: 0.5;
-    -webkit-border-radius: 3px 3px;
-    -moz-border-radius: 3px 3px;
-    border-radius: 3px 3px;
-    border: solid 1px #666;
-    color: #333;
-    text-decoration: none;
-    display: inline-block;
-    line-height: 1;
-    text-align: center;
-    min-width: 25px;
-    position: relative;
-    top: -1px;
-}
-
-/* Counter-act .breadcrumbs a */
-.breadcrumbs a.stargazer, .breadcrumbs button.stargazer {
-    font-size: 0.85em;
-    font-weight: normal;
-}
-
-button.stargazer {
-    background-color: #fca216;
-    color: #fff;
-    min-width: 35px;
-    cursor: pointer;
-    opacity: 1;
-}
-
-button.stargazer.highlight, a.stargazer.highlight {
-    background-color: #fca216;
-    background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffc874), to(#fca216));
-    background: -moz-linear-gradient(#ffc874,#fca216);
-    color: #fff;
-    text-shadow: 0px 1px 1px #333;
-    border-color: #d39534;
-    opacity: 1;
-}
-
-button.stargazer:hover, button.stargazer.active, a.stargazer.active, a.stargazer:hover {
-    background-color: #36C;
-    background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#69F), to(#36C));
-    background: -moz-linear-gradient(#69F,#36C);
-    color: #fff;
-    text-shadow: 0px 1px 1px #333;
-    border-color: #36C;
-    opacity: 1;
-}
-
-li button.dependencies-graph {
-    padding: 0;
-    border: 0;
-    font-size: inherit;
-}
-
 .user-profiles > a {
     text-decoration: none;
 }
@@ -219,6 +142,7 @@ ul {
 .comment {
     color: #999;
     font-size: 0.8em;
+    padding-right: 15px;
 }
 
 .select-text {
@@ -356,6 +280,24 @@ div.qtip-github table th {
 * see /release/Plack for example
 */
 
+#contributors {
+    width: 180px;
+    min-height: 40px;
+}
+#contributors .btn-link {
+    border: none;
+    padding: 0;
+}
+
+#contributors > ul {
+    padding-top: 0;
+}
+
+#contributors .contributors-header {
+    font-weight: bold;
+    text-align: center;
+}
+
 #contributors .contributor {
     position: relative;
     text-align: left;
@@ -371,14 +313,20 @@ div.qtip-github table th {
     vertical-align: top;
 }
 
+#contributors .contributor a {
+    padding-left: 22px;
+    padding-right: 0;
+    margin-left: -22px;
+}
+
 .smaller {
     font-size: 1.0em;
     line-height: 2.5em;
 }
 
 /*Home page*/
 #link_to_task_kensho {
-    width: 30%;
+    width: 27em;
     padding: 5px 0px 5px 0px;
     border-radius: 7px;
     margin-top: 5px;
@@ -391,10 +339,16 @@ div.qtip-github table th {
     color: #3a87ad;
 }
 
+#header-text-noresult {
+    padding-left: 0px;
+    font-size: 14px;
+}
+
 .news_feed {
-    width: 16px;
-    height: 16px;
-    background: url('/static/images/profile/feed.png') no-repeat 10px 0px;
-    padding-right: 20px;
     float: right;  
 }
+
+#icon-rss {
+    background: url('/static/icons/icon-rss.png');
+}
+