You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/10/08 21:08:21 UTC

git commit: updated refs/heads/ui-restyle to 6312369

Updated Branches:
  refs/heads/ui-restyle 97a07cc92 -> 6312369e2


Add advanced search styling


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6312369e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6312369e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6312369e

Branch: refs/heads/ui-restyle
Commit: 6312369e2e054c025d70fb96a5308d91f5b27c13
Parents: 97a07cc
Author: Brian Federle <br...@citrix.com>
Authored: Tue Oct 8 12:08:15 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Oct 8 12:08:15 2013 -0700

----------------------------------------------------------------------
 ui/stylesheets/_icons.scss       |  6 ++++
 ui/stylesheets/cloudstack.scss   | 62 ++++++++++++++++++++++++++++++++++-
 ui/stylesheets/csui/_button.scss |  1 +
 3 files changed, 68 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6312369e/ui/stylesheets/_icons.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/_icons.scss b/ui/stylesheets/_icons.scss
index 0719662..8b4c1cb 100644
--- a/ui/stylesheets/_icons.scss
+++ b/ui/stylesheets/_icons.scss
@@ -14,6 +14,12 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
+
+@mixin csui-sprite($x, $y) {
+    background: url(../images/sprites.png) no-repeat -#{$x}px -#{$y}px;
+}
+
+
 .action.edit .icon {
     background-position: 1px -1px;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6312369e/ui/stylesheets/cloudstack.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index 0ff5616..73566c3 100644
--- a/ui/stylesheets/cloudstack.scss
+++ b/ui/stylesheets/cloudstack.scss
@@ -224,6 +224,66 @@ body {
 .list-view {
     @include csui-list;
 
+    // Advanced search field
+    #advanced_search {
+        float: right;
+        .icon {
+            @include csui-sprite(61, 167);
+
+            position: relative;
+            width: 15px;
+            height: 15px;
+            left: 215px;
+            top: 10px;
+            cursor: pointer;
+            z-index: 10000;
+        }
+
+        .form-container {
+            @include csui-dialog;
+            @include csui-form;
+
+            width: 400px;
+            margin-top: -15px;
+            margin-left: -160px;
+            opacity: 0.9;
+            padding-top: 0px;
+
+            form {
+                display: inline-block;
+                border: none;
+            }
+
+            .message { display: none; }
+
+            .form-item {
+                margin-top: 20px;
+            }
+
+            .name {
+                position: relative;
+                top: -20px;
+            }
+
+            input[type=submit], .button.cancel {
+                position: relative;
+                top: 25px;
+            }
+
+            input[type=submit] {
+                @include csui-button-cta;
+
+                float: right;
+            }
+
+            .button.cancel {
+                @include csui-button;
+
+                float: left;
+            }
+        }
+    }
+
     max-height: 85%;
 }
 
@@ -257,7 +317,7 @@ body {
                 background: lighten(#ccc, 12%);
             }
         }
-        
+
         th, td {
             padding: 10px;
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6312369e/ui/stylesheets/csui/_button.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_button.scss b/ui/stylesheets/csui/_button.scss
index 087ca50..48b3982 100644
--- a/ui/stylesheets/csui/_button.scss
+++ b/ui/stylesheets/csui/_button.scss
@@ -27,6 +27,7 @@
     border-radius: 3px;
     border: 1px solid black;
     cursor: pointer;
+    text-align: center;
 
     &:hover {
         box-shadow: inset 0 0 10px black;