Changed Split to single button dropdown

owncloud · Jun 7, 2018 · ede1970 · ede1970
1 parent 60a2ee1
commit ede1970
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 35 deletions.
diff --git a/css/app/angularBootstrap.css b/css/app/angularBootstrap.css
@@ -381,7 +381,7 @@ fieldset[disabled] .btn-default.focus {
 }
 
 .caret {
-	display: inline-block;
+	display: inline-block !important;
 	width: 0;
 	height: 0;
 	margin-left: 2px;
@@ -396,27 +396,6 @@ fieldset[disabled] .btn-default.focus {
 	margin-left: 0;
 }
 
-.sr-only {
-	position: absolute;
-	width: 1px;
-	height: 1px;
-	padding: 0;
-	margin: -1px;
-	overflow: hidden;
-	clip: rect(0, 0, 0, 0);
-	border: 0;
-}
-
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
-	position: static;
-	width: auto;
-	height: auto;
-	margin: 0;
-	overflow: visible;
-	clip: auto;
-}
-
 .open > .dropdown-menu {
 	display: block;
 }
@@ -679,3 +658,11 @@ fieldset[disabled] .btn-default.focus {
 		left: 0;
 	}
 }
+
+.single-button-sidebar {
+	width: 100%;
+}
+
+.cancel-button-sidebar {
+	margin-right: 0 !important;
+}
diff --git a/templates/editor.popover.php b/templates/editor.popover.php
@@ -40,20 +40,19 @@ class="checkbox"
 			</div>
 		</fieldset>
 		<fieldset class="events--fieldset pull-left" ng-if="!readOnly">
+			<button ng-click="delete()" ng-if="!is_new && !isRecurring()" class="events--button button btn delete" type="button" tabindex="110">
+				<?php p($l->t('Delete')); ?>
+			</button>
 			<div class="btn-group" uib-dropdown ng-if="!is_new && isRecurring()">
-				<button id="split-button" type="button" ng-click="delete()" class="btn delete" tabindex="110"><?php p($l->t('Delete')); ?></button>
-				<button type="button" class="btn delete" uib-dropdown-toggle>
+				<button id="single-button" type="button" class="btn delete" tabindex="110" uib-dropdown-toggle>
+					<?php p($l->t('Delete')); ?>
 					<span class="caret"></span>
-					<span class="sr-only"></span>
 				</button>
-				<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="split-button">
+				<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button">
 					<li role="menuitem"><a ng-click="delete()" href="#"><?php p($l->t('Delete all')); ?></a></li>
 					<li role="menuitem"><a ng-click="deleteOccurrence()" href="#"><?php p($l->t('Delete just occurrence')); ?></a></li>
 				</ul>
 			</div>
-			<button ng-click="delete()" ng-if="!is_new && !isRecurring()" class="events--button button btn delete" type="button" tabindex="110">
-				<?php p($l->t('Delete')); ?>
-			</button>
 			<button ng-click="cancel()" class="events--button button btn" type="button" tabindex="111">
 				<?php p($l->t('Cancel')); ?>
 			</button>

diff --git a/templates/editor.sidebar.php b/templates/editor.sidebar.php
@@ -106,19 +106,18 @@ class="events--button button btn delete btn-half pull-left"
 						tabindex="280">
 						<?php p($l->t('Delete')); ?>
 					</button>
-					<div class="btn-group" uib-dropdown ng-if="!is_new && isRecurring()">
-						<button id="split-button" type="button" ng-click="delete()" class="events--button button btn delete pull-left btn-half" tabindex="280"><?php p($l->t('Delete')); ?></button>
-						<button type="button" class="btn delete" uib-dropdown-toggle>
+					<div class="btn-group btn-half pull-left" uib-dropdown ng-if="!is_new && isRecurring()">
+						<button id="single-button" type="button" class="events--button button btn delete single-button-sidebar" tabindex="280" uib-dropdown-toggle>
+							<?php p($l->t('Delete')); ?>
 							<span class="caret"></span>
-							<span class="sr-only"></span>
 						</button>
-						<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="split-button">
+						<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button">
 							<li role="menuitem"><a ng-click="delete()" href="#"><?php p($l->t('Delete all')); ?></a></li>
 							<li role="menuitem"><a ng-click="deleteOccurrence()" href="#"><?php p($l->t('Delete just occurrence')); ?></a></li>
 						</ul>
 					</div>
 					<button
-						class="evens--button button btn btn-half pull-right"
+						class="evens--button button btn btn-half pull-right cancel-button-sidebar"
 						ng-click="cancel()"
 						ng-if="!is_new"
 						type="button"