Skip to content

Commit

Permalink
Merge pull request #1957 from mikeller/fix_landing_page
Browse files Browse the repository at this point in the history
Fixed the styling of the landing page.
  • Loading branch information
mikeller committed Apr 12, 2020
2 parents 69ab24e + 9908865 commit b00063c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 45 deletions.
2 changes: 1 addition & 1 deletion locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@
"message": "Contributing"
},
"defaultContributingText": {
"message": "If you would like to help make Betaflight even better you can help in many ways, including:<br /><ul><li>Answering other users questions on the forums and IRC.</li><li>Contributing code to the firmware and configurator - new features, fixes, improvements</li><li>Testing <a href=\"https://github.com/Betaflight/betaflight/pulls\" target=\"_blank\">new features/fixes</a> and providing feedback.</li><li>Helping out with <a href=\"https://github.com/betaflight/betaflight/issues\" target=\"_blank\">issues and commenting on feature requests</a>.</li><li>Collaborate by <a href=\"https://crowdin.com/project/betaflight-configurator\" target=\"_blank\">translating the configurator application</a> into your language.</li><li></li></ul>"
"message": "If you would like to help make Betaflight even better you can help in many ways, including:<br /><ul><li>Answering other users questions on the forums and IRC.</li><li>Contributing code to the firmware and configurator - new features, fixes, improvements</li><li>Testing <a href=\"https://github.com/Betaflight/betaflight/pulls\" target=\"_blank\">new features/fixes</a> and providing feedback.</li><li>Helping out with <a href=\"https://github.com/betaflight/betaflight/issues\" target=\"_blank\">issues and commenting on feature requests</a>.</li><li>Collaborate by <a href=\"https://crowdin.com/project/betaflight-configurator\" target=\"_blank\">translating the configurator application</a> into your language.</li></ul>"
},
"defaultFacebookText": {
"message": "We also have a <a href=\"https://www.facebook.com/groups/betaflightgroup/\" target=\"_blank\">Facebook Group</a>.<br />Join us to get a place to talk about Betaflight, ask configuration questions, or just hang out with fellow pilots."
Expand Down
6 changes: 6 additions & 0 deletions src/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,12 @@ li.active .ic_mission {
/* Cause the height to shrink to contain its floated contents while log is open */
}

#content li {
list-style: initial;
list-style-type: circle;
margin-left: 30px;
}

#status-bar {
position: fixed;
bottom: 0px;
Expand Down
48 changes: 5 additions & 43 deletions src/css/tabs/landing.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,45 +52,6 @@
font-weight: 300;
}

/* sponsors blocks */
.sponsors .title {
text-transform: uppercase;
font-size: 10px;
}

.sponsors {
margin-left: auto;
margin-right: auto;
text-align: center;
color: silver;
}

.sponsors ul {
margin-top: 5px;
}

.sponsors li {
display: inline-block;
margin-right: 10px;
}

.sponsors li a {
border-radius: 3px;
padding: 2px;
padding-left: 4px;
padding-right: 4px;
font-size: 13px;
line-height: 22px;
color: white;
font-weight: normal;
font-weight: 300;
}

.sponsors li a:hover {
background-color: rgba(255, 255, 255, 0.30);
color: #fff;
}

.text1, .text2, .text3, .text4 {
margin-top: 15px;
margin-bottom: 15px;
Expand Down Expand Up @@ -150,8 +111,8 @@
border: 1px solid var(--subtleAccent);
border-radius: 5px;
background: white;
margin-right: 25px;
margin-left: 20px;
margin-right: 20px;
margin-left: 10px;
margin-top: 5px;
min-height: 187px;
font-size: 11px;
Expand All @@ -166,6 +127,8 @@
padding: 15px;
padding-top: 0px;
padding-bottom: 0px;
overflow: hidden;
float: left;
}

.tab-landing .content_mid_bottom .logo {
Expand All @@ -176,8 +139,7 @@
.tab-landing .content_mid_bottom .text4 {
margin-top: 0px;
margin-left: 5px;
display: block;
float: left;
display: inline-block;
}

.tab-landing .languageSwitcher .selected_language {
Expand Down
1 change: 0 additions & 1 deletion src/tabs/landing.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ <h3 i18n="defaultDonateHead"></h3>
</div>
<div class="content_foot">
<div class="languageSwitcher"></div>
<div class="sponsors"></div>
</div>
</div>
</div>

0 comments on commit b00063c

Please sign in to comment.