Browse Source

add some primary dialog actions; update css

Andrew Dolgov 6 years ago
parent
commit
6fb5ce5e35
7 changed files with 61 additions and 20 deletions
  1. 1 1
      classes/feeds.php
  2. 4 4
      classes/pref/feeds.php
  3. 2 2
      classes/pref/filters.php
  4. 1 1
      classes/pref/labels.php
  5. 0 0
      css/default.css
  6. 52 11
      css/dijit.less
  7. 1 1
      plugins/share/init.php

+ 1 - 1
classes/feeds.php

@@ -1161,7 +1161,7 @@ class Feeds extends Handler_Protected {
 				</div>";
 		}
 
-		print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
+		print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
 		<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').hide()\">".__('Cancel')."</button>
 		</div>";
 

+ 4 - 4
classes/pref/feeds.php

@@ -742,7 +742,7 @@ class Pref_Feeds extends Handler_Protected {
 			<input type=\"hidden\" name=\"method\" value=\"uploadicon\">			
 			<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
 				type=\"submit\">".__('Replace')."</button>
-			<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
+			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
 				type=\"submit\">".__('Remove')."</button>
 			</form>";
 
@@ -760,7 +760,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<div class='dlgButtons'>
 			<div style=\"float : left\">
-			<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
 				__('Unsubscribe')."</button>";
 
 			print "</div>";
@@ -1467,7 +1467,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<div class='dlgButtons'>";
 		print "<div style='float : left'>";
-		print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
+		print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
 			.__('Unsubscribe from selected feeds')."</button> ";
 		print "</div>";
 
@@ -1534,7 +1534,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<div class='dlgButtons'>";
 		print "<div style='float : left'>";
-		print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
+		print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
 			.__('Unsubscribe from selected feeds')."</button> ";
 		print "</div>";
 

+ 2 - 2
classes/pref/filters.php

@@ -514,14 +514,14 @@ class Pref_Filters extends Handler_Protected {
 			print "<div class=\"dlgButtons\">";
 
 			print "<div style=\"float : left\">";
-			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').removeFilter()\">".
+			print "<button dojoType=\"dijit.form.Button\" class=\"btn-danger\" onclick=\"return dijit.byId('filterEditDlg').removeFilter()\">".
 				__('Remove')."</button>";
 			print "</div>";
 
 			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">".
 				__('Test')."</button> ";
 
-			print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
+			print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
 				__('Save')."</button> ";
 
 			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">".

+ 1 - 1
classes/pref/labels.php

@@ -78,7 +78,7 @@ class Pref_Labels extends Handler_Protected {
 #			print "</form>";
 
 			print "<div class=\"dlgButtons\">";
-			print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"primary\" onclick=\"dijit.byId('labelEditDlg').execute()\">".
+			print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"dijit.byId('labelEditDlg').execute()\">".
 				__('Save')."</button>";
 			print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelEditDlg').hide()\">".
 				__('Cancel')."</button>";

File diff suppressed because it is too large
+ 0 - 0
css/default.css


+ 52 - 11
css/dijit.less

@@ -184,11 +184,13 @@
 
 	/* Various buttons */
 
-	.dijitButton.danger .dijitButtonText {
+	/* danger */
+	
+	.dijitButton.btn-danger .dijitButtonText {
 		color: #ffffff;
 	}
 
-	.dijitButton.danger {
+	.dijitButton.btn-danger {
 		text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 		background-color: #da4f49;
 		*background-color: #bd362f;
@@ -204,19 +206,62 @@
 		filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 	}
 
-	.dijitButton.dijitButtonDisabled.danger,
-	.dijitButton.dijitButtonActive.danger,
-	.dijitButton.dijitButtonHover.danger,
-	.dijitButton.dijitFocused.danger {
+	.dijitButton.dijitButtonDisabled.btn-danger,
+	.dijitButton.dijitButtonActive.btn-danger,
+	.dijitButton.dijitButtonHover.btn-danger,
+	.dijitButton.dijitFocused.btn-danger {
 		color: #ffffff;
 		background-color: #bd362f;
 		*background-color: #a9302a;
 	}
 
-	.dijitButton.dijitButtonActive.danger {
+	.dijitButton.dijitButtonActive.btn-danger {
 		background-color: #942a25 \9;
 	}
 
+	.dijitButton.dijitButtonActive.btn-danger {
+		color: rgba(255, 255, 255, 0.75);
+	}
+	
+	/* primary */
+
+	.dijitButton.btn-primary .dijitButtonText {
+		color: #ffffff;
+	}
+
+	.dijitButton.btn-primary {
+		text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+		background-color: #2883b3;
+		*background-color: #257aa7;
+		background-image: -moz-linear-gradient(top, #4ba6d8, #257aa7);
+		background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4ba6d8), to(#257aa7));
+		background-image: -webkit-linear-gradient(top, #4ba6d8, #257aa7);
+		background-image: -o-linear-gradient(top, #4ba6d8, #257aa7);
+		background-image: linear-gradient(to bottom, #4ba6d8, #257aa7);
+		background-repeat: repeat-x;
+		border-color: #257aa7 #257aa7 #1d5f82;
+		border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	}
+
+	.dijitButton.dijitButtonDisabled.btn-primary,
+	.dijitButton.dijitButtonActive.btn-primary,
+	.dijitButton.dijitButtonHover.btn-primary,
+	.dijitButton.dijitFocused.btn-primary {
+		color: #ffffff;
+		background-color: #257aa7;
+		*background-color: #1d6185;
+	}
+
+	.dijitButton.dijitButtonActive.btn-primary {
+		background-color: #1f678d \9;
+	}
+
+	.dijitButton.dijitButtonActive.btn-primary {
+		color: rgba(255, 255, 255, 0.75);
+	}
+	
+	/* others */
+
 	.dijitDropDownButton {
 		margin: 0px;
 	}
@@ -225,10 +270,6 @@
 		padding: 0px;
 	}
 
-	.dijitButton.dijitButtonActive.danger {
-		color: rgba(255, 255, 255, 0.75);
-	}
-
 	.dijitButton .dijitButtonNode,
 	.dijitDropDownButton .dijitButtonNode,
 	.dijitComboButton .dijitButtonNode,

+ 1 - 1
plugins/share/init.php

@@ -40,7 +40,7 @@ class Share extends Plugin {
 
 			print "<p>" . __("You can disable all articles shared by unique URLs here.") . "</p>";
 
-			print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">".
+			print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">".
 				__('Unshare all articles')."</button> ";
 
 			print "</p>";

Some files were not shown because too many files changed in this diff