Merge remote-tracking branch 'xnat-web-custom-pages/master' into HEAD

Conflicts:
	src/main/webapp/xnat-templates/navigations/XNATQuickSearch.vm
	src/main/webapp/xnat-templates/screens/UploadApplet.vm

src/main/webapp/page/admin/style.css

@@ -8,7 +8,7 @@
 .xnat-nav-tabs li {
     float: left; margin-right: -1px; margin-bottom: -1px;
     padding: 0;
-    border: 1px solid #e0e0e0;
+    border: 1px solid #c8c8c8;
     box-sizing: border-box;
 }
 .xnat-nav-tabs li:hover { background: #f0f0f0; }
@@ -22,23 +22,23 @@
 }
 .xnat-nav-tabs li > a:active { /*outline: none !important;*/ }
 .xnat-nav-tabs li > a:hover { background: inherit; }
-.xnat-nav-tabs li.active { background: #2fa4e7; border-color: #e0e0e0; z-index: 2; }
+.xnat-nav-tabs li.active { background: #2fa4e7; border-color: #c8c8c8; z-index: 2; }
 .xnat-nav-tabs li.active > a { color: #000; background: #fff !important; }
 .xnat-nav-tabs li.active > a:hover { background: inherit; cursor: default; }
 
 /* TOP TABS */
 .xnat-nav-tabs.top {  }
 .xnat-nav-tabs.top li { border-bottom: none; }
-.xnat-nav-tabs.top li > a { border-bottom: 1px solid #e0e0e0; }
+.xnat-nav-tabs.top li > a { border-bottom: 1px solid #c8c8c8; }
 .xnat-nav-tabs.top li.active > a {
     top: 5px; padding-top: 3px; padding-bottom: 13px;
     border-bottom-color: #fff;
 }
 
 /* LEFT-SIDE TABS */
-.xnat-nav-tabs.side { width: 25%; right: -1px; }
+.xnat-nav-tabs.side { width: 25%; right: -1px; padding-top: 12px; }
 .xnat-nav-tabs.side li { width: 100%; border-right: none; }
-.xnat-nav-tabs.side li > a { border-right: 1px solid #e0e0e0; }
+.xnat-nav-tabs.side li > a { border-right: 1px solid #c8c8c8; }
 .xnat-nav-tabs.side li.active { /* border-bottom-color: #d0d0d0; */ }
 .xnat-nav-tabs.side li.active > a { padding-left: 12px; padding-right: 24px; border-left: 6px solid #2fa4e7; border-right-color: #fff; }
 /*.xnat-tab-content.side.pull-right .panel { padding: 24px; }*/
@@ -47,7 +47,7 @@
 /* TAB GROUPS */
 .xnat-nav-tabs.side .tab-group { display: none; margin-top: 20px; padding: 0; list-style-type: none; }
 .xnat-nav-tabs.side .tab-group li.label {
-    padding: 10px 2px; border: none;  text-align: left;
+    padding: 16px 2px 6px; border: none;  text-align: left;
     font-size: 13px; font-weight: bold; color: #000; }
 .xnat-nav-tabs.side .tab-group li.label:hover { background: inherit; }
 .xnat-nav-tabs.side .tab-group:first-of-type { margin-top: 0; }
@@ -55,28 +55,28 @@
 
 /* TAB CONTENT AND PANES */
 .xnat-tab-content {
-    padding: 20px 20px 0; margin-bottom: 20px;
-    background: #fff; border: 1px solid #e0e0e0;
+    padding: 0 30px; margin-bottom: 30px;
+    background: #fff; border-left: 1px solid #c8c8c8;
     box-sizing: border-box;
 }
 .xnat-tab-content .tab-pane { display: none; min-height: 500px; height: auto; overflow: auto; background: #fff; }
 .xnat-tab-content .tab-pane > .pad { margin-bottom: 20px; padding: 20px 20px 0 20px; }
 .xnat-tab-content .tab-pane > .footer {
     width: 100%; position: absolute; bottom: 0; padding: 10px 15px; overflow: auto;
-    background: #f0f0f0; border-top: 1px solid #e0e0e0; }
+    background: #f0f0f0; border-top: 1px solid #c8c8c8; }
 .xnat-tab-content .tab-pane.active { display: block; }
 .xnat-tab-content.side { width: 75%; }
 
 /* PANELS */
-body.xnat .panel { margin-bottom: 20px; background: #f8f8f8; border-radius: 0; }
-body.xnat .panel-default { border: 1px solid #e0e0e0; }
+body.xnat .panel { margin-bottom: 30px; background: /* #f8f8f8 */ inherit; border-radius: 0; }
+body.xnat .panel-default { border: 1px solid #c8c8c8; }
 .panel-default .panel-heading {
-    padding: 12px 16px; font-size: 15px;
-    color: #222; background: #e9e9e9; border-color: #d0d0d0 ;
+    padding: 12px 16px;
+    color: #222; /background: /* #e9e9e9 */ inherit;
 }
 .panel-default .panel-body { padding: 12px; }
-.panel-default .panel-footer  { padding: 12px; background: #f0f0f0; }
-.panel-title { font-weight: bold; font-size: 15px; line-height: inherit; }
+.panel-default .panel-footer  { padding: 12px; background: #f0f0f0; border-top: #c8c8c8; }
+.panel-title { font-weight: normal; font-size: 20px; line-height: inherit; }
 
 /* PANEL ELEMENTS */
 .panel .panel-element { margin: 15px 0; clear: both; overflow: auto; }
@@ -95,7 +95,7 @@ body.xnat .panel-default { border: 1px solid #e0e0e0; }
 .panel .panel-subhead {
     padding: 2px; margin: 10px;
     font-size: 13px;
-    border-bottom: 1px solid #e0e0e0;
+    border-bottom: 1px solid #c8c8c8;
 }
 
 /* ELEMENT GROUP ITEMS */
@@ -118,7 +118,7 @@ body.xnat textarea.form-control { font-family: Courier, monospace; font-weight:
   ========================================================== */
 .input-table { border-collapse: collapse; }
 .input-table td { padding: 5px; border: 1px solid #e0e0e0; }
-.input-table input { border: 1px solid #e0e0e0; }
+.input-table input { border: 1px solid #c8c8c8; }
 
 
 /* CONFIG PANELS */

src/main/webapp/style/app.less

@@ -979,7 +979,7 @@ body input.btn1[type="submit"] {
     color: #fff;
     background-color: #07428d;
     background-image: url('../images/btn1_30px.png');
-    border: 1px solid /* #508ad0 */ /* #243356 */ #293d66;
+    border: 1px solid /* #508ad0 */ /* #243356 */ /* #293d66 */ #102040;
     font-weight: bold;
 }
 
@@ -990,7 +990,7 @@ body input[type="button"],
 body input[type="submit"],
 body input[type="reset"] {
     background-image: url('../images/btn2_30px.png');
-    border: 1px solid /* #a8a8a8 */ #a0a0a0;
+    border: 1px solid /* #a8a8a8 */ /* #a0a0a0 */ #848484;
 }
 
 /* smaller btn */