From dd3f9c75fac7c6186fda170060ab36f094d7a8e3 Mon Sep 17 00:00:00 2001 From: Amitosh Swain Mahapatra Date: Jun 17 2018 17:32:59 +0000 Subject: Unbreak HTML layout breakages introduced with style modifications --- diff --git a/config.xml b/config.xml index a3099b9..51f35fc 100644 --- a/config.xml +++ b/config.xml @@ -53,7 +53,6 @@ - @@ -62,6 +61,7 @@ + - + diff --git a/package-lock.json b/package-lock.json index 4b7df84..4672efd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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" } diff --git a/package.json b/package.json index b3b8ac5..6cb6a94 100644 --- a/package.json +++ b/package.json @@ -113,4 +113,4 @@ "android" ] } -} +} \ No newline at end of file diff --git a/src/app/app.scss b/src/app/app.scss index 8da86c1..4344684 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -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); +} diff --git a/src/pages/ask/ask.html b/src/pages/ask/ask.html index be8ca8a..6440d60 100644 --- a/src/pages/ask/ask.html +++ b/src/pages/ask/ask.html @@ -30,7 +30,7 @@ - diff --git a/src/pages/calendar/calendar.html b/src/pages/calendar/calendar.html index 90390a7..befbf03 100644 --- a/src/pages/calendar/calendar.html +++ b/src/pages/calendar/calendar.html @@ -35,7 +35,7 @@

{{ meeting.displayTime.timeString }}

- diff --git a/src/pages/calendar/calendar.scss b/src/pages/calendar/calendar.scss index e5641ce..74c1505 100644 --- a/src/pages/calendar/calendar.scss +++ b/src/pages/calendar/calendar.scss @@ -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; } diff --git a/src/pages/magazine/magazine.html b/src/pages/magazine/magazine.html index eb09dac..63c4d3f 100644 --- a/src/pages/magazine/magazine.html +++ b/src/pages/magazine/magazine.html @@ -4,27 +4,6 @@ See http://ionicframework.com/docs/v2/components/#navigation for more info on Ionic pages and navigation. --> - diff --git a/src/pages/magazine/magazine.scss b/src/pages/magazine/magazine.scss index 8202349..7de1411 100644 --- a/src/pages/magazine/magazine.scss +++ b/src/pages/magazine/magazine.scss @@ -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*/