You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/28 21:22:35 UTC
[64/79] [abbrv] git commit: fixing style sheets and adding an icon
fixing style sheets and adding an icon
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ed3382c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ed3382c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ed3382c8
Branch: refs/pull/29/merge
Commit: ed3382c831b2c6feb289d1cba986066052ecd89c
Parents: 80c4ddd
Author: Shawn Feldman <sh...@gmail.com>
Authored: Mon Jan 27 16:38:08 2014 -0700
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Mon Jan 27 16:38:08 2014 -0700
----------------------------------------------------------------------
portal/config.js | 2 +-
portal/css/main.css | 244 ++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 244 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ed3382c8/portal/config.js
----------------------------------------------------------------------
diff --git a/portal/config.js b/portal/config.js
index d48c0b8..3b85851 100644
--- a/portal/config.js
+++ b/portal/config.js
@@ -23,7 +23,7 @@ Usergrid.options = {
]
},
{
- path:'#!/users',pic:'',title:'Users',
+ path:'#!/users',pic: '👤',title:'Users',
items:[
{path:'#!/users',pic:'👤',title:'Users'},
{path:'#!/groups',pic:'👥',title:'Groups'},
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ed3382c8/portal/css/main.css
----------------------------------------------------------------------
diff --git a/portal/css/main.css b/portal/css/main.css
index cdb31fe..f7a2877 100644
--- a/portal/css/main.css
+++ b/portal/css/main.css
@@ -1457,4 +1457,246 @@ form input.has-error{
}
.dropdown-backdrop {
position: static;
-}
\ No newline at end of file
+}
+
+/*----------------------------- monitoring global*/
+
+.title.with-icons a {
+ display: inline-block;
+ text-transform: lowercase;
+ font-size: .8em;
+ margin: 0 5px 0 0;
+}
+
+
+
+/*---------------------------- page filters */
+
+
+.span9.tab-content {
+ margin: 0;
+}
+
+.span9.tab-content .content-page{
+ padding: 0 0 0 30px;
+}
+
+.button-toolbar,
+.menu-toolbar {
+ /*text-align: center;*/
+ padding: 10px 0;
+ margin: 0;
+ /*border-bottom: 1px solid #DFDFDF;*/
+ width: 100%;
+}
+
+.menu-toolbar {
+ padding: 0 0 20px 0;
+ /*margin: -21px 0 10px -28px;*/
+}
+
+.menu-toolbar > ul.inline {
+ border-bottom: 1px solid #c5c5c5;
+ margin: 0;
+}
+
+
+
+.btn.btn-primary,
+.btn.btn-primary:hover,
+.modal-footer .btn,
+.modal-footer .btn:hover,
+.btn.normal,
+.btn.normal:hover,
+.btn-group .filter-selector{
+ /*-moz-box-shadow: 3px 3px 0px -1px #ccc;*/
+ /*-webkit-box-shadow: 3px 3px 0px -1px #ccc;*/
+ /*box-shadow: 3px 3px 0px -1px #ccc;*/
+}
+
+
+
+.btn.btn-primary,
+.modal-footer .btn,
+.btn.normal,
+.btn-group .filter-title,
+.btn-group .filter-title:active,
+.btn-group .filter-title:focus,
+.btn-group.open .btn.dropdown-toggle.filter-title,
+.btn-group > .filter-title.btn:first-child,
+.btn-group .filter-selector,
+.btn-group .filter-selector:hover,
+.btn-group .filter-selector:active,
+.btn-group .filter-selector:focus,
+.btn-group.open .btn.dropdown-toggle.filter-selector,
+.btn-group > .filter-selector.btn:first-child {
+ color: #fff;
+ padding: 3px 9px;
+ text-shadow: none;
+ background-color: #494949;
+ background-image: none;
+ border: 1px solid #c5c5c5;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+ border-bottom-left-radius: 0;
+ -webkit-border-top-left-radius: 0;
+ border-top-left-radius: 0;
+ box-shadow: none;
+}
+
+ul.inline > li.tab {
+ margin: 0;
+ padding: 0;
+}
+
+li.tab .btn.btn-primary {
+ background-color: #eee;
+ border: none;
+ color:#494949;
+ box-shadow: none;
+ margin: 0 -1px -1px -1px;
+ padding: 3px 19px 3px 16px;
+ border-bottom: 1px solid #c5c5c5;
+}
+
+ul.inline > li.tab.selected {
+ margin: 0 0 -1px 0;
+ border-bottom: 1px solid #fff;
+}
+
+li.tab.selected .btn.btn-primary.toolbar {
+ color: #494949;
+ border-left: 1px solid #c5c5c5;
+ border-right: 1px solid #c5c5c5;
+ border-top: 1px solid #c5c5c5;
+ border-bottom: none;
+ background-color: #fff;
+
+}
+
+.btn.btn-primary.toolbar,
+.btn-group.compare .filter-selector.btn:first-child{
+ color:#494949;
+ background-color: #f1f1f1;
+}
+
+li.selected .btn.btn-primary.toolbar {
+ color: #fff;
+ border: 1px solid #1b70a0;
+ background-color: #1b70a0;
+}
+
+/*.action {*/
+/*background-color: #494949;*/
+/*}*/
+
+.btn.cancel,
+.btn.cancel:hover,
+.btn.normal.white,
+.btn.normal.white:hover{
+ background-color: #fff;
+ color: #5f5f5f;
+}
+
+.btn-group.compare .filter-selector.btn:first-child {
+ /*margin: 7px 9px 0 0;*/
+ /*background-color: #999;*/
+}
+
+
+.btn.btn-primary:hover,
+.modal-footer .btn:hover,
+.btn.normal:hover,
+.btn-group .filter-title:hover,
+.btn.btn-primary:active,
+.modal-footer .btn:active,
+.btn-group .filter-selector:active,
+.btn-group.selected > .filter-selector.btn:first-child,
+.btn-group.selected .filter-selector {
+ color: #fff;
+ border: 1px solid #1b70a0;
+ background-color: #1b70a0;
+}
+
+.btn-group.compare {
+ /*margin: 4px -1px 4px 6px;*/
+ /*transition: all .1s ease;*/
+
+}
+
+
+
+.btn-group.compare:active,
+.btn-group.compare.selected {
+ /*margin: 6px -5px 0 10px;*/
+}
+
+.btn-group .filter-selector .caret {
+ margin: 8px 0 0 10px;
+ border-top: 4px solid #fff;
+ border-right: 4px solid transparent;
+ border-left: 4px solid transparent;
+}
+
+
+.btn-group.header-button {
+ margin: 4px 0 0 0;
+ text-transform: none;
+}
+
+.btn.select-all {
+ /*margin: 0 10px 0 0;*/
+}
+
+.page-filters {
+ padding: 0;
+ margin: 10px 0 10px 0;
+}
+
+.dropdown-menu {
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+ z-index: 102;
+}
+
+.modal {
+ position: fixed;
+ top: 10%;
+ left: 50%;
+
+ width: 560px;
+ margin-left: -280px;
+ background-color: #ffffff;
+ border: 1px solid #999;
+ border: 1px solid rgba(0, 0, 0, 0.3);
+ *border: 1px solid #999;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+ -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+ box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+ -webkit-background-clip: padding-box;
+ -moz-background-clip: padding-box;
+ background-clip: padding-box;
+ outline: none;
+}
+
+.modal.fade {
+ z-index: -200;
+}
+
+.modal.fade.in {
+ z-index: 1050;
+}
+
+.auto-update-container {
+ padding: 10px 0 0 0;
+}
+
+.auto-updates{
+ margin: 0 10px 0 0;
+}
+