From: Ciro Scognamiglio Date: Mon, 16 Feb 2015 15:40:04 +0000 (+0100) Subject: fed4fire style changes X-Git-Tag: myslice-1.3~58^2~11 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=2f7fdac30f4a7775d0f806d379c441f1fe100a1d fed4fire style changes --- diff --git a/plugins/apply/templates/apply.html b/plugins/apply/templates/apply.html index f05af49d..9e251b7e 100644 --- a/plugins/apply/templates/apply.html +++ b/plugins/apply/templates/apply.html @@ -1,16 +1,18 @@ -
- +
+ +
+ - - - - - -
+ \ No newline at end of file diff --git a/plugins/filter_status/templates/filter_status.html b/plugins/filter_status/templates/filter_status.html index 8350eb11..3d1c44b4 100644 --- a/plugins/filter_status/templates/filter_status.html +++ b/plugins/filter_status/templates/filter_status.html @@ -1,5 +1,5 @@ -
- View: + diff --git a/portal/static/css/fed4fire.css b/portal/static/css/fed4fire.css index ca827bf4..70de2a8f 100644 --- a/portal/static/css/fed4fire.css +++ b/portal/static/css/fed4fire.css @@ -30,7 +30,10 @@ h3 { font-size:13pt; color:#201E62; } - +input[type=checkbox] { + min-width:5px !important; + margin-left:0 !important; +} input[type=text], input[type=password], input[type=email], input[type=tel], input[type=number] { min-width:260px; padding:6px; @@ -57,7 +60,7 @@ div.wrapper { div.wide { - margin:25px auto; + margin:0 auto 25px auto; padding:0 25px; } @@ -382,37 +385,54 @@ ul.nav-resources a { div#slice-view { margin:0; } -div.list-group-item { - border:0; - background-color:white; - font-weight:bold; - padding-left:0; + +/* FACILITY/TESTBED filters */ +div.sl-filter-facilities { + padding:0 5px; } -a.list-group-item { - border:0; - background-color:white; - padding:3px 0 3px 10px; - border-left:2pt white solid; +div.sl-filter-facilities h4 { + margin-bottom:15px; + } -a.list-group-item.active, a.list-group-item.active:hover { - font-weight: bold; +img.sl-image { + margin:0 5px 5px 0; + padding:0; + vertical-align:middle; +} +a.sl-facility { + color:gray; + text-decoration:none; +} +a.sl-facility:hover { + color:#342961; +} +a.sl-facility.active { color:black; - background-color:transparent; - border-left:2pt blue solid; + text-decoration:none; } -a.list-group-item.active:hover { - background-color:#dddddd; +a.sl-facility::before { + content: " "; } -a.list-group-item:hover { - border-left:2pt blue solid; +div.sl-facilities { + border-bottom:#CCCCCC 1px solid; + padding-bottom:15px; + margin-bottom:15px; } -a.list-group-item p.list-group-item-text { - font-size:9pt; - font-style:italic; - font-weight: normal; - color: black !important; +div.sl-facilities:last-child { + border:0; +} +a.sl-testbed { + color:gray; + text-decoration:none; + margin-left:25px; + margin-bottom:5px; +} +a.sl-testbed:hover { + color:#342961; +} +a.sl-testbed.active { + color:black; } - div#slice-info { margin-top:25px; } @@ -502,12 +522,51 @@ div.dataTables_filter label{ width:400px; } +div.sl-filter-resources { + margin:10px 0; + text-align:center; +} +span.sl-resources { + font-size:9pt; + color:gray; +} +a.sl-resources { + font-size:9pt; + border:0; + padding:2px 8px; + margin:0 5px; + -moz-border-radius: 2px; + border-radius: 2px; + text-align: center; +} +a.sl-resources.active, a.sl-resources.active:hover, a.sl-resources.active:focus { + border:0; + padding:2px 8px; + -moz-border-radius: 2px; + border-radius: 2px; + background-color:#FFA500; + color:#000000; +} +a.sl-resources:first-child { +} +button.btn-apply { + background-color:#FFA500; + border-bottom: 2pt solid #FFCA00; + color:black; + font-size:13px; + padding:2px 8px; + margin:0 5px; + -moz-border-radius: 2px; + border-radius: 2px; + text-align: center; +} + /**/ .header { -moz-box-shadow: 0 0 1px rgba(82,82,82,0.6); -webkit-box-shadow: 0 0 1px rgba(82,82,82,0.6); box-shadow: 0 0 1px rgba(82,82,82,0.6); - height:61px; + height:60#px; background-color:white; } div.navigation { @@ -607,7 +666,11 @@ div.dataTables_filter label{ float:left; width:400px; } - +div.breadcrumbs { + margin:15px 0; + color:gray; + font-size:10pt; +} /* Service Directory */ div#appservices div.row { diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css index ef5d3e39..cb2c071f 100644 --- a/portal/static/css/onelab.css +++ b/portal/static/css/onelab.css @@ -382,6 +382,7 @@ div.container-resource, div.container-slice { div#slice-view { margin:0; } + div.sl-filter-facilities { padding:0 5px; } @@ -428,32 +429,43 @@ a.sl-testbed:hover { a.sl-testbed.active { color:black; } +div.sl-filter-resources { + margin:10px 0; + text-align:center; +} span.sl-resources { font-size:9pt; color:gray; } -a.sl-resources, a.sl-resources:hover { +a.sl-resources { font-size:9pt; border:0; - padding:2px 4px; - -moz-border-radius: 4px; - border-radius: 4px; - width:105px; - margin-left:4px; - margin-bottom:8px; + padding:2px 8px; + margin:0 5px; + -moz-border-radius: 2px; + border-radius: 2px; text-align: center; } a.sl-resources.active, a.sl-resources.active:hover, a.sl-resources.active:focus { border:0; - -moz-border-radius: 4px; - border-radius: 4px; + padding:2px 8px; + -moz-border-radius: 2px; + border-radius: 2px; + background-color:#FFA500; + color:#000000; } a.sl-resources:first-child { - margin-left:12px; } button.btn-apply { + background-color:#FFA500; + border-bottom: 2pt solid #FFCA00; + color:black; font-size:13px; padding:2px 8px; + margin:0 5px; + -moz-border-radius: 2px; + border-radius: 2px; + text-align: center; } div#slice-info { margin-top:25px; diff --git a/portal/static/icons/Mobile.png b/portal/static/icons/Mobile.png new file mode 100644 index 00000000..81ee438b Binary files /dev/null and b/portal/static/icons/Mobile.png differ diff --git a/portal/templates/servicedirectory.html b/portal/templates/servicedirectory.html index 78502cf6..a4485af5 100644 --- a/portal/templates/servicedirectory.html +++ b/portal/templates/servicedirectory.html @@ -1,13 +1,10 @@ {% extends "layout_wide.html" %} -{% block head %} - -{% endblock head %} - {% block content %}
+