merge CSS

Author: alexandresalome

Resources/doc/install/symfony2.rst

@@ -76,8 +76,7 @@ If you are using Assetic:
 .. code-block:: html+jinja
 
     {% stylesheets
-        "bundles/gitonomytwig/css/diff.css"
-        "bundles/gitonomytwig/css/log.css"
+        "bundles/gitonomytwig/css/all.css"
     %}
         <link rel="stylesheet" href="{{ asset(asset_url) }}" />
     {% endstylesheets %}
@@ -90,8 +89,7 @@ If you are using Assetic:
 
 If not, you just need to make your application load those stylesheets:
 
-* @GitonomyGitBundle/Resources/public/css/diff.css
-* @GitonomyGitBundle/Resources/public/css/log.css
+* @GitonomyGitBundle/Resources/public/css/all.css
 
 And those javascripts:
 

Resources/public/css/diff.css renamed to Resources/public/css/all.css

@@ -1,3 +1,5 @@
+/** Diff **/
+
 .file-wrapper .file {
   margin-top: 10px;
 }
@@ -58,3 +60,73 @@
   background-color: #efefef;
 }
 
+/** Log **/
+
+span.git-author {
+    background-color: #ddeeff;
+    display: inline-block;
+    padding: 1px 5px;
+}
+
+.git-log-wrapper {
+    position: relative;
+    overflow: hidden;
+}
+
+.git-log {
+    width: 100%;
+    position: relative;
+    z-index: 1;
+}
+
+.git-log-wrapper svg {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    z-index: 2;
+    pointer-events: none;
+}
+
+.git-log thead th a,
+.git-log tfoot th a
+{
+    display: block;
+    background-color: #efefef;
+    font-weight: normal;
+    padding: 1em;
+}
+
+.git-log th, .git-log td {
+    line-height: 1.2em;
+}
+
+.git-log th {
+    text-align: left;
+    background-color: #e7e7e7;
+    line-height: 1.8em;
+}
+
+/** References **/
+
+.ref {
+    background-color: #ddd;
+    padding: 1px 5px;
+    margin-right: 5px;
+    border-radius: 5px;
+    font-size: 0.8em;
+}
+
+.ref.branch {
+    background-color: #33ff33;
+}
+
+.ref.branch.remote {
+    background-color: #e5e100;
+}
+
+.ref.tag {
+    background-color: black;
+    color: white;
+}
+