Aligning the buttons

Evolveum · Apr 28, 2016 · 1d33e40 · 1d33e40
1 parent 2910940
commit 1d33e40
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/.../main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.html b/.../main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.html
@@ -23,7 +23,7 @@
 
    	    <wicket:child />
 
-      	<div style="margin: 20px 0;" class="form-group" wicket:id="executeOptions" />
+      	<div class="options-container" wicket:id="executeOptions" />
 
    	    <div class="main-button-bar">
             <span class="button-group">

diff --git a/.../java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.html b/.../java/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel.html
@@ -18,7 +18,7 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
     <div class="box">
-    	<div class="box-header">
+    	<div class="box-header with-border">
         	<h3 class="box-title"><wicket:message key="ExecuteChangeOptionsPanel.options"/></h3>
         </div>
 	    <div class="box-body">

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.html
@@ -22,7 +22,7 @@
     <form wicket:id="mainForm" class="form-horizontal">
         <div wicket:id="mainPanel"/>
         <div class="main-button-bar">
-            <a class="btn btn-danger" wicket:id="cancel"/>
+            <a class="btn btn-default" wicket:id="cancel"/>
             <a class="btn btn-primary" wicket:id="save"/>
         </div>
     </form>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java
@@ -129,7 +129,7 @@ protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html.
         mainForm.setDefaultButton(save);
         mainForm.add(save);
 
-        AjaxSubmitButton cancel = new AjaxSubmitButton(ID_CANCEL_BUTTON, createStringResource("PageBase.button.cancel")) {
+        AjaxSubmitButton cancel = new AjaxSubmitButton(ID_CANCEL_BUTTON, createStringResource("PageBase.button.back")) {
 
             @Override
             protected void onError(AjaxRequestTarget target, org.apache.wicket.markup.html.form.Form<?> form) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
@@ -278,7 +278,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
         mainForm.setDefaultButton(save);
         mainForm.add(save);
 
-        AjaxSubmitButton cancel = new AjaxSubmitButton(ID_CANCEL_BUTTON, createStringResource("PageBase.button.cancel")) {
+        AjaxSubmitButton cancel = new AjaxSubmitButton(ID_CANCEL_BUTTON, createStringResource("PageBase.button.back")) {
 
             @Override
             protected void onError(AjaxRequestTarget target, Form<?> form) {

diff --git a/gui/admin-gui/src/main/webapp/less/midpoint-theme.less b/gui/admin-gui/src/main/webapp/less/midpoint-theme.less
@@ -790,6 +790,10 @@ div.dashAssignmentHeader {
 	background-color: #ffcaca;
 }
 
+.options-container {
+
+}
+
 .option-checkbox {
 	float: left;
 	border: 1px solid @table-divider-color;
@@ -799,6 +803,10 @@ div.dashAssignmentHeader {
 	padding-right: 6px;
 }
 
+.main-button-bar {
+
+}
+
 // Badge colors used in object details tabs (and maybe elsewhere)
 
 .badge-active {

diff --git a/gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less b/gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
@@ -142,15 +142,6 @@ th h3 {
   margin-bottom: 0px;
 }
 
-div.mainContainer {
-  margin: 0 20px;
-}
-
-div.main-button-bar {
-  padding-top: 10px;
-  padding-bottom: 20px;
-}
-
 /*
  * select picker
  */