浏览代码

HUE-6343 [useradmin] admin.css from indexer is conflicting into useradmin

Romain Rigaux 8 年之前
父节点
当前提交
7cacdd9

+ 1 - 1
apps/useradmin/src/useradmin/static/useradmin/css/useradmin.css

@@ -14,4 +14,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 See the License for the specific language governing permissions and
 limitations under the License.
 limitations under the License.
- */.fixed{position:fixed;top:80px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.sortable{cursor:pointer}.file-row{height:37px}.steps{padding-top:20px;margin-bottom:100px;border:1px solid #DDDDDD;border-top:transparent}.section{margin:20px}input[type=submit]{margin-left:50px}.nav-tabs .active{font-weight:bold}.form-actions{padding-left:0 !important}@media all and (max-height:800px){.form-actions{z-index:2;border-top:1px solid #F1F1F1;position:fixed;bottom:0;left:0;width:100%;margin:0;padding-left:20px !important}}
+ */.fixed{position:fixed;top:80px;filter:progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.sortable{cursor:pointer}.file-row{height:37px}.steps{padding-top:20px;margin-bottom:100px;border:1px solid #DDDDDD;border-top:transparent}#editUserComponents .section{margin:20px}#editUserComponents input[type=submit]{margin-left:50px}#editUserComponents .nav-tabs .active{font-weight:bold}#editUserComponents .title{margin-top:5px}#editUserComponents .form-actions{padding-left:0 !important}@media all and (max-height:800px){.form-actions{z-index:2;border-top:1px solid #F1F1F1;position:fixed;bottom:0;left:0;width:100%;margin:0;padding-left:20px !important}}

+ 8 - 4
apps/useradmin/src/useradmin/static/useradmin/less/useradmin.less

@@ -40,19 +40,23 @@
   border-top: transparent;
   border-top: transparent;
 }
 }
 
 
-.section {
+#editUserComponents .section {
   margin: 20px;
   margin: 20px;
 }
 }
 
 
-input[type=submit] {
+#editUserComponents input[type=submit] {
   margin-left: 50px;
   margin-left: 50px;
 }
 }
 
 
-.nav-tabs .active {
+#editUserComponents .nav-tabs .active {
   font-weight: bold;
   font-weight: bold;
 }
 }
 
 
-.form-actions {
+#editUserComponents .title {
+  margin-top: 5px;
+}
+
+#editUserComponents .form-actions {
   padding-left: 0 !important;
   padding-left: 0 !important;
 }
 }
 
 

+ 1 - 1
apps/useradmin/src/useradmin/templates/edit_user.mako

@@ -32,7 +32,7 @@ ${ layout.menubar(section='users') }
 
 
 
 
 <div id="editUserComponents" class="container-fluid">
 <div id="editUserComponents" class="container-fluid">
-  <div class="card card-small">
+  <div class="card card-small title">
     % if username:
     % if username:
       <h1 class="card-heading simple">${_('Hue Users - Edit user: %(username)s') % dict(username=username)}</h1>
       <h1 class="card-heading simple">${_('Hue Users - Edit user: %(username)s') % dict(username=username)}</h1>
     % else:
     % else: