#85 Unbreak HTML layout for first evaluation build
Merged 10 months ago by a2batic. Opened 10 months ago by amitosh.
amitosh/Fedora-app unbreak-html  into  master

file modified
+2 -2

@@ -53,7 +53,6 @@ 

      <icon src="resources/android/icon/drawable-xhdpi-icon.png" />

      <plugin name="cordova-plugin-device" spec="~1.1.3" />

      <plugin name="cordova-plugin-console" spec="~1.0.4" />

-     <plugin name="cordova-plugin-splashscreen" spec="~3.2.2" />

      <plugin name="ionic-plugin-keyboard" spec="~2.2.1" />

      <plugin name="cordova-plugin-statusbar" spec="~2.1.3" />

      <plugin name="cordova-plugin-whitelist" spec="~1.2.2" />

@@ -62,6 +61,7 @@ 

      <plugin name="cordova-plugin-inappbrowser" spec="^1.4.0" />

      <plugin name="cordova-plugin-native-spinner" spec="^1.1.3" />

      <plugin name="cordova-plugin-x-toast" spec="^2.5.2" />

+     <plugin name="cordova-plugin-splashscreen" spec="^3.2.2" />

      <engine name="browser" spec="5.0.3" />

-     <engine name="android" spec="7.0.0" />

+     <engine name="android" spec="~7.0.0" />

  </widget>

file modified
+37 -76

@@ -1529,46 +1529,38 @@ 

        "dependencies": {

          "abbrev": {

            "version": "1.1.1",

-           "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",

-           "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="

+           "bundled": true

          },

          "android-versions": {

            "version": "1.2.1",

-           "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.2.1.tgz",

-           "integrity": "sha1-P1C69pPnOlEsPFQDVCKRzq2QAGM="

+           "bundled": true

          },

          "ansi": {

            "version": "0.3.1",

-           "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",

-           "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="

+           "bundled": true

          },

          "balanced-match": {

            "version": "1.0.0",

-           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",

-           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="

+           "bundled": true

          },

          "base64-js": {

            "version": "0.0.8",

-           "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",

-           "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg="

+           "bundled": true

          },

          "big-integer": {

            "version": "1.6.26",

-           "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.26.tgz",

-           "integrity": "sha1-OvFnL6Ytry1eyvrPblqg0l4Cwcg="

+           "bundled": true

          },

          "bplist-parser": {

            "version": "0.1.1",

-           "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",

-           "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",

+           "bundled": true,

            "requires": {

              "big-integer": "^1.6.7"

            }

          },

          "brace-expansion": {

            "version": "1.1.8",

-           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",

-           "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",

+           "bundled": true,

            "requires": {

              "balanced-match": "^1.0.0",

              "concat-map": "0.0.1"

@@ -1576,13 +1568,11 @@ 

          },

          "concat-map": {

            "version": "0.0.1",

-           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",

-           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="

+           "bundled": true

          },

          "cordova-common": {

            "version": "2.2.0",

-           "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-2.2.0.tgz",

-           "integrity": "sha1-DQD1vNK8bH0Gsd3AMorqP+OLzwc=",

+           "bundled": true,

            "requires": {

              "ansi": "^0.3.1",

              "bplist-parser": "^0.1.0",

@@ -1601,21 +1591,18 @@ 

          },

          "cordova-registry-mapper": {

            "version": "1.1.15",

-           "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz",

-           "integrity": "sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw="

+           "bundled": true

          },

          "elementtree": {

            "version": "0.1.6",

-           "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",

-           "integrity": "sha1-KsTEbqMFFsjEy9teOsdBjlkt4gw=",

+           "bundled": true,

            "requires": {

              "sax": "0.3.5"

            }

          },

          "glob": {

            "version": "5.0.15",

-           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",

-           "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",

+           "bundled": true,

            "requires": {

              "inflight": "^1.0.4",

              "inherits": "2",

@@ -1626,8 +1613,7 @@ 

          },

          "inflight": {

            "version": "1.0.6",

-           "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",

-           "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",

+           "bundled": true,

            "requires": {

              "once": "^1.3.0",

              "wrappy": "1"

@@ -1635,52 +1621,44 @@ 

          },

          "inherits": {

            "version": "2.0.3",

-           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",

-           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="

+           "bundled": true

          },

          "lodash": {

            "version": "3.10.1",

-           "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",

-           "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="

+           "bundled": true

          },

          "minimatch": {

            "version": "3.0.4",

-           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",

-           "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",

+           "bundled": true,

            "requires": {

              "brace-expansion": "^1.1.7"

            }

          },

          "nopt": {

            "version": "3.0.6",

-           "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",

-           "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",

+           "bundled": true,

            "requires": {

              "abbrev": "1"

            }

          },

          "once": {

            "version": "1.4.0",

-           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",

-           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",

+           "bundled": true,

            "requires": {

              "wrappy": "1"

            }

          },

          "os-homedir": {

            "version": "1.0.2",

-           "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",

-           "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="

+           "bundled": true

          },

          "os-tmpdir": {

            "version": "1.0.2",

-           "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",

-           "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="

+           "bundled": true

          },

          "osenv": {

            "version": "0.1.4",

-           "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",

-           "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",

+           "bundled": true,

            "requires": {

              "os-homedir": "^1.0.0",

              "os-tmpdir": "^1.0.0"

@@ -1688,13 +1666,11 @@ 

          },

          "path-is-absolute": {

            "version": "1.0.1",

-           "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",

-           "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="

+           "bundled": true

          },

          "plist": {

            "version": "1.2.0",

-           "resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz",

-           "integrity": "sha1-CEtQk93JJQbiWfh0uNmxr7jHlZM=",

+           "bundled": true,

            "requires": {

              "base64-js": "0.0.8",

              "util-deprecate": "1.0.2",

@@ -1704,61 +1680,50 @@ 

          },

          "properties-parser": {

            "version": "0.2.3",

-           "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz",

-           "integrity": "sha1-91kSVfcHq7/yJ8e1a2N9uwNzoQ8="

+           "bundled": true

          },

          "q": {

            "version": "1.5.1",

-           "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",

-           "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="

+           "bundled": true

          },

          "sax": {

            "version": "0.3.5",

-           "resolved": "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz",

-           "integrity": "sha1-iPz8H3PAyLvVt8d2ttPzUB7tBz0="

+           "bundled": true

          },

          "semver": {

            "version": "5.4.1",

-           "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",

-           "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4="

+           "bundled": true

          },

          "shelljs": {

            "version": "0.5.3",

-           "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",

-           "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="

+           "bundled": true

          },

          "underscore": {

            "version": "1.8.3",

-           "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",

-           "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="

+           "bundled": true

          },

          "unorm": {

            "version": "1.4.1",

-           "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",

-           "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA="

+           "bundled": true

          },

          "util-deprecate": {

            "version": "1.0.2",

-           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",

-           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="

+           "bundled": true

          },

          "wrappy": {

            "version": "1.0.2",

-           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",

-           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="

+           "bundled": true

          },

          "xmlbuilder": {

            "version": "4.0.0",

-           "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz",

-           "integrity": "sha1-mLj2UcowqmJANvEn0RzGbce5B6M=",

+           "bundled": true,

            "requires": {

              "lodash": "^3.5.0"

            }

          },

          "xmldom": {

            "version": "0.1.27",

-           "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",

-           "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="

+           "bundled": true

          }

        }

      },

@@ -3733,13 +3698,11 @@ 

          },

          "balanced-match": {

            "version": "1.0.0",

-           "bundled": true,

-           "optional": true

+           "bundled": true

          },

          "brace-expansion": {

            "version": "1.1.11",

            "bundled": true,

-           "optional": true,

            "requires": {

              "balanced-match": "^1.0.0",

              "concat-map": "0.0.1"

@@ -3756,8 +3719,7 @@ 

          },

          "concat-map": {

            "version": "0.0.1",

-           "bundled": true,

-           "optional": true

+           "bundled": true

          },

          "console-control-strings": {

            "version": "1.1.0",

@@ -3886,7 +3848,6 @@ 

          "minimatch": {

            "version": "3.0.4",

            "bundled": true,

-           "optional": true,

            "requires": {

              "brace-expansion": "^1.1.7"

            }

file modified
+1 -1

@@ -113,4 +113,4 @@ 

        "android"

      ]

    }

- }

+ } 

\ No newline at end of file

file modified
+23 -37

@@ -21,10 +21,8 @@ 

  .iframeWrapper iframe {

      width: 100%;

      height: 100%;

-   }

-   

-   //tab icons-active 

-   ion-icon {

+ } //tab icons-active

+ ion-icon {

      &[class*="fedora-"] {

          mask-size: contain;

          mask-position: 50% 50%;

@@ -48,10 +46,8 @@ 

      &[class*="fedora-more"] {

          mask-image: url(../assets/img/more-active.svg);

      }

-   }

-   

-   //tab icons-inactive

-   .tabs {

+ } //tab icons-inactive

+ .tabs {

      a[aria-selected=false] {

          .tab-button-icon[ng-reflect-name=fedora-home] {

              mask-image: url(../assets/img/home-inactive.svg);

@@ -77,17 +73,14 @@ 

              mask-image: url(../assets/img/more-inactive.svg);

          }

      }

-   }

-   

-   ion-buttons {

-       button {

-           background-color: transparent;

-       }

+ }

+ 

+ ion-buttons {

+     button {

+         background-color: transparent;

      }

-     

-   

-   //tab typography

-   .tabs {

+ } //tab typography

+ .tabs {

      a[aria-selected=false] {

          span {

              font-family: "Montserrat-Regular";

@@ -106,33 +99,26 @@ 

              line-height: 12px;

          }

      }

-   }

-   

-   .tabs-md[tabsLayout=icon-top] .has-icon .tab-button-text {

+ }

+ 

+ .tabs-md[tabsLayout=icon-top] .has-icon .tab-button-text {

      margin-top: 8px;

-   }

-   

-   //styles of the tabbar

-   .tabbar {

+ } //styles of the tabbar

+ .tabbar {

      padding: 12px 0;

      background-color: #fff !important;

      box-shadow: 0 2px 4px 0 #565656 !important;

      justify-content: space-around !important;

-   }

-   

-   .tab-button {

+ }

+ 

+ .tab-button {

      overflow: visible !important;

      flex: none;

-   }

-   

-   //styles of the top navbar

-   ion-navbar {

+ } //styles of the top navbar

+ ion-navbar {

      ion-title {

          text-align: center;

      }

      background-color: #fff !important;

-     box-shadow: 0 2px 4px 0 rgba(86,

-     86,

-     86,

-     0.05);

-   } 

\ No newline at end of file

+     box-shadow: 0 2px 4px 0 rgba(86, 86, 86, 0.05);

+ }

file modified
+1 -1

@@ -30,7 +30,7 @@ 

            </strong>

          </ion-col>

          <ion-col width-10 center>

-           <button ion-button small tappable (click)="shareQuestion(question)">

+           <button float-right ion-button small tappable (click)="shareQuestion(question)">

              <ion-icon name="share"></ion-icon>

            </button>

          </ion-col>

@@ -35,7 +35,7 @@ 

              <p>{{ meeting.displayTime.timeString }}</p>

            </ion-col>

            <ion-col width-33 padding>

-             <button ion-button id="add_button" small tappable (click)="addToCalendar(meeting)">

+             <button ion-button class="add-button" small tappable (click)="addToCalendar(meeting)">

                <ion-icon name="add"></ion-icon>Add

              </button>

            </ion-col>

@@ -1,34 +1,25 @@ 

  .calendar {

-   ion-list{

-     margin-top: 40px;

+   #cal_icon {

+       float: none;

+       z-index: 1;

+       display: block;

+       position: absolute;

+       left: 0;

+       right: 0;

+       top: 20px;

+       margin: auto;

+   }

+   ion-list {

+       margin-top: 40px !important;

+   }

+   .item {

+       background-color: transparent;

+   }

+   ion-select {

+       margin: 0 auto;

+   }

+   .add-button {

+       background-color: #79db32;

+       float: right;

    }

- }

- html, body

- {

-   padding: 0;

-   margin: 0;

- }

- 

- #cal_icon{

-   float:none;

-   z-index: 1;

-   display:block;

-   position:absolute;

-   left:0;

-   right:0;

-   top:20px;

-   margin:auto;

- }

- 

- .item

- {

-   background-color: transparent;

- }

- 

- ion-select{

-   margin: 0 auto;

- }

- 

- #add_button{

-   background-color: #79db32;

  }

@@ -4,27 +4,6 @@ 

    See http://ionicframework.com/docs/v2/components/#navigation for more info on

    Ionic pages and navigation.

  -->

- <style rel="stylesheet">

- ion-row{

-   background-color: #294172;

- }

- 

- #title

- {

-   color: #ffffff;

- }

- 

- ion-card

- {

-   margin-top: 50px;

- }

- 

- .button{

-   background-color: transparent;

-   box-shadow: none;

- }

- 

- </style>

  <ion-content class="magazine">

  <ion-navbar>

    <button ion-button menuToggle>

@@ -45,7 +24,7 @@ 

            <strong id="title" [innerHtml]="post.title"></strong>

          </ion-col>

          <ion-col width-20 center>

-           <button ion-button small tappable clear color="light" (click)="sharePost(post)">

+           <button float-right ion-button small tappable clear color="light" (click)="sharePost(post)">

              <ion-icon name="share"></ion-icon>

            </button>

          </ion-col>

@@ -1,35 +1,25 @@ 

- /*Magazine page starts*/

- 

- 

- 

- /*magazine page starts*/

- html, body

- {

- 

-   padding: 0;

-   margin: 0;

+ .magazine {

+     ion-row {

+         background-color: #294172;

+     }

+     #title {

+         color: #ffffff;

+     }

+     ion-list {

+         margin-top: 50px;

+     }

+     .button {

+         background-color: transparent;

+         box-shadow: none;

+     }

+     #maglogo {

+         position: absolute;

+         top: 0;

+         left: 50px;

+     }

+     #mag-title {

+         position: absolute;

+         top: 10px;

+         right: 25px;

+     }

  }

- 

- 

- ion-card{

-   overflow: hidden;

- }

- #maglogo

- {

-   position: absolute;

-   top: 0;

-   left:50px;

- }

- 

- #mag-title

- {

-   position: absolute;

-   top: 10px;

-   right:25px;

- }

- 

- 

- 

- /*magazine page ends*/

- 

- /*Magazine page ends*/