Merge pull request #6 from patrickallaert/sync

Changed: syncing with changes made in ezdemo
ezsystems · May 8, 2013 · 22f3f4c · 22f3f4c
2 parents 797a4b6 + ad5bac2
commit 22f3f4c
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 4 deletions.
diff --git a/Resources/public/css/bootstrap.css b/Resources/public/css/bootstrap.css
@@ -919,8 +919,8 @@ aside > .content-view-aside:last-child > article:last-child:after {
 .content-view-embed .attribute-header h6 {
   border-bottom: 1px solid #ebebeb;
 }
-.content-view-embed .attribute-header  + div,
-.content-view-embed .attribute-header  + form {
+.content-view-embed .attribute-header + div,
+.content-view-embed .attribute-header + form {
   background-color: #fbfbfb;
   background-image: -moz-linear-gradient(top, #f9f9f9, #ffffff);
   background-image: -ms-linear-gradient(top, #f9f9f9, #ffffff);
@@ -931,7 +931,7 @@ aside > .content-view-aside:last-child > article:last-child:after {
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#ffffff', GradientType=0);
 }
-.content-view-embed .attribute-header  + form {
+.content-view-embed .attribute-header + form {
   padding-top: 10px;
 }
 .attribute-header + .comment,
@@ -1492,6 +1492,25 @@ aside > .content-view-aside:last-child > article:last-child:after {
 .class-call-to-action .attribute-header {
   padding-bottom: 20px;
 }
+.class-call-to-action .span2 {
+  text-align: right;
+}
+.class-call-to-action .form {
+  background-color: #f4f4f4;
+  padding: 10px 0 10px 0;
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+.class-call-to-action .form .content-action {
+  padding-right: 5px;
+}
+.class-call-to-action .span3 .box {
+  width: 95%;
+}
+.class-call-to-action .attribute-image {
+  padding-left: 10px;
+}
 #ajaxsearchbox .textfield {
   width: 150px;
   margin-bottom: 0;
@@ -3031,7 +3050,6 @@ table .span12 {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
   border-color: #e6e6e6 #e6e6e6 #bfbfbf;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   -webkit-border-radius: 4px;

diff --git a/Resources/public/less/layouts.less b/Resources/public/less/layouts.less
@@ -845,6 +845,25 @@ aside {
     .attribute-header {
         padding-bottom: 20px;
     }
+    .span2 {
+        text-align: right;
+    }
+    .form {
+        background-color: #f4f4f4;
+        padding: 10px 0 10px 0;
+        -webkit-border-radius: 10px;
+        -moz-border-radius: 10px;
+        border-radius: 10px;
+        .content-action {
+            padding-right: 5px;
+        }
+    }
+    .span3 .box {
+        width: 95%;
+    }
+    .attribute-image {
+        padding-left: 10px;
+    }
 }
 
 // Search column for landing page edit view