#131 Styles of meeting widget were added to style.css
Merged 8 years ago by ralph. Opened 8 years ago by kjtdimuthu.
kjtdimuthu/fedora-hubs develop  into  develop

file modified
+29
@@ -168,6 +168,16 @@ 

      width: 100%;

      text-align: center;

    }

+   .header .dropdown.edit {

+     position: absolute;

+     width:150px;

+     top: 90px;

+     left: 0;

+     z-index: 2;

+   }

+   .header .edit-this-page{

+     color:#000000;

+   }

  }

  

      h1, h2, h3, h4, h5, h6 {
@@ -356,3 +366,22 @@ 

         url('/fonts/Comfortaa-700/Comfortaa-700.ttf') format('truetype'),

         url('/fonts/Comfortaa-700/Comfortaa-700.svg#Comfortaa') format('svg');

  }

+ 

+ 

+ .meeting .meeting-date {

+     font-size: 18px;

+ }

+ 

+ .meeting .meeting-time {

+     font-size: 12px;

+ }

+ 

+ .meeting .meeting-info {

+     font-size: 14px;

+ }

+ 

+ .meeting .add-calendar {

+     font-size: 10px;

+     color: #a07cbc;

+ }

+ 

file modified
+2 -3
@@ -4,7 +4,6 @@ 

    <link href="{{ url_for('static', filename='bootstrap/css/bootstrap.css') }}" rel="stylesheet" />

    <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" />

    <link href="{{ url_for('static', filename='css/pace-theme-minimal.css') }}" rel="stylesheet" />

-   <link href="{{ url_for('static', filename='css/pygments/monokai.css') }}" rel="stylesheet"/>

  </head>

  <script src="{{ url_for('static', filename='js/pace.min.js') }}"></script>

  <body>
@@ -75,8 +74,8 @@ 

  </div>

  <div class="header">

    {% if g.auth.logged_in and not edit and hub.is_admin(g.auth.user) %}

-     <div class="dropdown pull-right edit">

-       <span class="dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">

+     <div class="dropdown edit">

+       <span class="dropdown-toggle edit-this-page" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">

          <span class="glyphicon glyphicon-edit"></span> edit this page

        </span>

        <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">

@@ -1,23 +1,40 @@ 

  {% if meetings %}

-     {% for title, items in meetings.items() %}

-         {% set next = items | next_meeting %}

-         {% if next %}

-         <p>The {{ next.meeting_name }} is {{ next.human_time }}</p>

-         {% if next.display_duration %}

-         <h1 class='inline'>{{next.start_date}} - {{next.stop_date}}</h1>

-         {% else %}

-         <h1 class='inline'>{{next.start_date}}</h1>

-         {% endif %}

-         <div class='inline'>

-             {% if next.display_time %}

-             @{{next.start_time}}<br/>

+ {% for title, items in meetings.items() %}

+ {% set next = items | next_meeting %}

+ {% if next %}

+ <div class="meeting">

+     <div class="row">

+         <h5>&nbsp;&nbsp;The {{ next.meeting_name }} is {{ next.human_time }}</h5>

+     </div>

+     <div class="row">

+         <div class="col-md-4 meeting-date">

+             {% if next.display_duration %}

+             <strong>{{next.start_date}} - {{next.stop_date}}</strong>

+             {% else %}

+             <strong>

+                 {{next.start_date}}

+             </strong>

              {% endif %}

-             {{next.location}}<br/>

+         </div>

+         <div class="col-md-4 meeting-time">

+             {% if next.display_time %}

+             @{{next.start_time}}{% endif %}<br>

+ 

+             <a href="#">{{next.location}}</a>

+         </div>

+         <div class="col-md-4">

+             <button class="btn btn-default btn-sm add-calendar"><strong>Add to calendar</strong></button>

+         </div>

+     </div>

+     <div class="row">

+         <div class="col-md-12 meeting-info">

              {{next.meeting_information_html}}

          </div>

-         {% endif %}

-         {% if meetings | length > 1 %}

-         <hr/>

-         {% endif %}

-     {% endfor %}

+     </div>

+ </div>

+ {% endif %}

+ {% if meetings | length > 1 %}

+ <hr>

+ {% endif %}

+ {% endfor %}

  {% endif %}

no initial comment

Pull-Request has been updated

8 years ago

Nice! It looks very good. :)

Pull-Request has been merged by ralph

8 years ago