Merge branch 'develop' into 1030-bug-scheduler-cannot-take-the-input-…

…time
rokwire · Feb 21, 2023 · 9456fdd · 9456fdd
2 parents 3f2703b + ec0bd5d
commit 9456fdd
Show file tree

Hide file tree

Showing 8 changed files with 266 additions and 104 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,12 +12,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix the height of Create Event button. [#1021](https://github.com/rokwire/events-manager/issues/1021)
 - Fix the hover text decoration and color of Edit button in the event detail page. [#1023](https://github.com/rokwire/events-manager/issues/1023)
 - Fix the scheduler to take the input from setting page. [#1030](https://github.com/rokwire/events-manager/issues/1023)
+- Fix the display of the orange line under the dropdown menu. [#1042](https://github.com/rokwire/events-manager/issues/1042)
 
 ### Changed
 - Change the GUI of text input field box. [#991](https://github.com/rokwire/events-manager/issues/991)
 - Update the style of pagination in user event listing page. [#989](https://github.com/rokwire/events-manager/issues/989)
 - Update the home page icon and events manager hyperlink redirection. [#1008](https://github.com/rokwire/events-manager/issues/1008)
 - Update Login and Logout button. [#1009](https://github.com/rokwire/events-manager/issues/1009)
+- Update the buttons in the user event edit page. [#1013](https://github.com/rokwire/events-manager/issues/1013)
+- Update the publish button and pending button on the campus event detail page. [#1014](https://github.com/rokwire/events-manager/issues/1014)
+- Update the style of the "Link a Sub-Event" button. [#1015](https://github.com/rokwire/events-manager/issues/1015)
+- Update the style of all checkboxes. [#1022](https://github.com/rokwire/events-manager/issues/1022)
+- Update the hover and focus style of all buttons. Refactored and cleaned unused styles. [#1048](https://github.com/rokwire/events-manager/issues/1048)
 
 ### Added
 - Add hyperlink to Privacy Policy in footer. [#997](https://github.com/rokwire/events-manager/issues/997)

diff --git a/requirements.txt b/requirements.txt
@@ -18,7 +18,7 @@ itsdangerous==1.1.0
 Jinja2==3.0.3
 MarkupSafe>=2.0
 pymongo[tls,srv]==3.10.0
-Werkzeug==0.15.5
+Werkzeug==2.2.3
 googlemaps==3.0.2
 flask_paginate
 boto3==1.9.188

diff --git a/static/main.css b/static/main.css
@@ -227,53 +227,78 @@ a {
   clip-path: polygon(0 50%, 100% 0, 100% 100%, 0% 100%);
 }
 
-.create-event-button, .create-event-button:hover, .create-event-button:active {
-  width: 123px;
-  height: 32px;
-  margin: 19px 0 13.2px 24px;
-  padding: 4px 0px 9px;
-  background-color: #D85536;
-  font-size: 14px;
-  font-weight: bold;
-  border-radius: 24px;
-  border: solid 2px #D85536;
-  font-family: proxima-nova, sans-serif;
-}
-
 .white-background-button {
-  width: auto;
-  height: auto;
-  padding: 9px 20px 7px 19px;
+  height: 30px;
+  padding-left: 20px;
+  padding-right: 20px;
   border-radius: 24px;
   border: solid 2px #e84a27;
   background-color: #fff;
   color:#002855;
   font-weight: bold;
   font-size: 14px;
   text-decoration: none;
+  display:flex;
+  justify-content: center;
+  align-items: center;
 }
 .white-background-button:hover, .white-background-button:active {
   background-color: #e84a27;
   border-radius: 24px;
   border: solid 2px #e84a27;
+  color: #ffffff;
   text-decoration: none;
-  color:#002855;
 }
 
-.orange-background-button, .orange-background-button:hover, .orange-background-button:active, .orange-background-button:disabled {
-  width: auto;
-  height: auto;
-  padding: 9px 25px 7px 24px;
+.orange-background-button {
+  height: 30px;
+  padding-left: 20px;
+  padding-right: 20px;
   border-radius: 24px;
   border: solid 2px #e84a27;
   background-color: #e84a27;
   font-weight: bold;
   font-size: 14px;
   color: #ffffff;
+  display:flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.orange-background-button:hover {
+  background-color: #f5821e;
+  border: solid 2px #f5821e;
+  text-decoration: none;
+  color: #FFFFFF;
+}
+
+.orange-background-button:focus, .white-background-button:focus {
+  border: solid 2px #009fd4;
+  outline: none;
 }
 
-.notification-button, .notification-button:hover, .notification-button:active {
-  padding: 9px 19px 7px 18px;
+.orange-background-button:disabled {
+  text-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+  font-family: ProximaNova, sans-serif;
+  font-size: 16px;
+  font-weight: bold;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: 1.38;
+  letter-spacing: normal;
+  text-align: center;
+  color: #dadde1;
+  border: solid 2px #dadde1;
+  background-color: #FFFFFF;
+}
+
+.notification-button {
+  height: 30px;
+  display:flex;
+  justify-content: center;
+  align-items: center;
+  padding-left: 20px;
+  padding-right: 20px;
   border-radius: 24px;
   border: solid 1px #002855;
   background: #ffffff;
@@ -282,6 +307,16 @@ a {
   font-size: 14px;
 }
 
+.notification-button:hover {
+  background: #002855;
+  color: #FFFFFF;
+}
+
+.notification-button:focus {
+  border: solid 1px #009fd4;
+  outline: none;
+}
+
 .grey-background-button, .grey-background-button:hover, .grey-background-button:active {
   padding: 10px 12px 8px 10px;
   border-radius: 4px;
@@ -530,6 +565,7 @@ h5 {
 }
 
 .add-a-contact {
+  cursor: pointer;
   padding: 9px 20px 7px 19px;
   border-radius: 24px;
   border: solid 2px #e84a27;
@@ -545,10 +581,11 @@ h5 {
 }
 
 .add-a-contact:hover, .add-a-contact:active {
-  background-color: #fff;
+  background-color: #e84a27;
 }
 
 .icon-add {
+  cursor: pointer;
   float:right;
   margin-left:15px;
   margin-right:-15px
@@ -588,19 +625,21 @@ h5 {
   margin-top: 22px;
 }
 
-.filter-checkbox {
+input[type="checkbox"] {
   -webkit-appearance: none;
   -moz-appearance: none;
        appearance: none;
+  vertical-align: middle;
   margin: 0;
   width: 20px;
   height: 20px;
   border: 0.7px solid #717372;
-  display: grid;
+  display: inline-grid;
   place-content: center;
+  position: inherit;
 }
 
-.filter-checkbox::before {
+input[type="checkbox"]::before {
   content: "";
   width: inherit;
   height: inherit;
@@ -610,7 +649,7 @@ h5 {
   transition: 120ms transform ease-in-out;
 }
 
-.filter-checkbox:checked::before {
+input[type="checkbox"]:checked::before {
   transform: scale(1);
   background-color: #20375c;
 }
@@ -628,3 +667,86 @@ h5 {
   color: white;
   text-decoration: none;
 }
+
+.eventsmanager-dropdown-menu {
+  position: relative;
+  width: 300px;
+  height:50px;
+}
+
+.eventsmanager-dropdown-menu input {
+  cursor: pointer;
+}
+
+.eventsmanager-dropdown-menu::before {
+    content:"";
+    width: 0;
+    height: 0;
+    border: 7px solid transparent;
+    border-color: #ff552e transparent transparent transparent;
+    position: absolute;
+    top: 16px;
+    right: 10px;
+}
+
+.eventsmanager-dropdown-menu .dropdown-menu-option {
+  cursor: pointer;
+}
+
+.user-group-menu.active::before {
+  top:9px;
+  transform: rotate(-180deg);
+}
+
+.category-menu.active::before {
+  top:9px;
+  transform: rotate(-180deg);
+}
+
+.subcategory-menu.active::before {
+  top:9px;
+  transform: rotate(-180deg);
+}
+
+.timezone-menu.active::before {
+  top:9px;
+  transform: rotate(-180deg);
+}
+
+.dropdown-menu-option-item {
+  position: relative;
+  width:100%;
+  cursor: pointer;
+  padding: 12px 16px;
+  height: 48px;
+  font-family: proxima-nova, sans-serif;
+  font-size: 16px;
+  font-weight: normal;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: 1.25;
+  letter-spacing: normal;
+  color: #002855;
+  background-color: #fff;
+  display: none;
+  border: solid 1px #dadde1;
+  z-index: 1000000;
+}
+
+.dropdown-menu-option-item:hover {
+  background-color: #009fd4;
+  color: #FFFFFF;
+}
+
+select#dropdown-menu-arrow {
+    appearance: none;
+}
+
+select#subcategory {
+    appearance: none;
+}
+
+.dropdown-line {
+  display: none;
+  width:100%;height:2px;border:1px solid #e84a27;background: #e84a27;border-width: 1px;
+}
diff --git a/templates/events/add-new-event.html b/templates/events/add-new-event.html
@@ -293,7 +293,7 @@ <h5>Cost Description</h5>
               <h5>Contacts </h5>
             </div>
             <div class="col-sm-9">
-              <span role="button" class="add-a-contact add-one btn">Add A Contact <img src="{{url_for('static',filename = 'icon-add.svg')}}" class="icon-add"></span>
+              <span role="button" class="add-a-contact add-one btn">Add Contact <img src="{{url_for('static',filename = 'icon-add.svg')}}" class="icon-add"></span>
             </div>
           </div>
 
@@ -442,7 +442,7 @@ <h5>Display Only with Super Event</h5>
               </div>
 
               <div class="col-sm-9">
-                <span role="button" class="add-sub btn btn-outline-primary">+ Link a Sub-Event</span>
+                <span role="button" class="add-a-contact add-sub btn">Link Sub-Event <img src="{{url_for('static',filename = 'icon-add.svg')}}" class="icon-add"></span>
               </div>
             </div>
           </div>
@@ -483,10 +483,10 @@ <h5>Display Only with Super Event</h5>
   <div class="row justify-content-center">
    <div role="toolbar" aria-label="Toolbar with button groups">
      <div class="btn-group mr-2" role="group" aria-label="first group">
-       <a class="white-background-button btn btn-block nav-link btn-outline-secondary" href="{{ url_for('user_events.user_events') }}" role="button">Cancel</a>
+       <a class="white-background-button" href="{{ url_for('user_events.user_events') }}" role="button">Cancel</a>
      </div>
      <div class="btn-group mr-2" role="group" aria-label="Second group">
-       <button id="submit-data" class="orange-background-button btn btn-block nav-link btn-primary" type="submit" >Add </button>
+       <button id="submit-data" class="orange-background-button" type="submit" >Add </button>
      </div>
    </div>
   </div>