Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust and group options style with headers like Firefox #43 #170

Merged
merged 41 commits into from
Apr 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
cdbfc6c
css style
ongspxm Mar 12, 2019
4de4b17
initial change to html elements
ongspxm Mar 14, 2019
0d8d75a
Update options.css
ongspxm Mar 14, 2019
6e9868d
Update options.html
ongspxm Mar 14, 2019
0e54e5b
Update options.css
ongspxm Mar 14, 2019
cca6403
some updates
ongspxm Mar 14, 2019
6b5a75d
indentation
ongspxm Mar 14, 2019
017e620
messages.json
ongspxm Mar 14, 2019
55f003a
making it nice
ongspxm Mar 14, 2019
3d6f2b4
using ul li
ongspxm Mar 18, 2019
210d612
update msg hierachy
ongspxm Mar 18, 2019
2744708
rm important
ongspxm Mar 18, 2019
4a7c06e
basic style changes
ongspxm Mar 18, 2019
fab4d49
update ul li & data-group
ongspxm Mar 18, 2019
fbe937d
encapsulate h1 header in section
ongspxm Mar 19, 2019
68ba219
fix spacings
ongspxm Mar 20, 2019
7030a37
fix qrcode option type
ongspxm Mar 20, 2019
dbfad3d
update settings
ongspxm Mar 20, 2019
0257f67
update sizeType
ongspxm Mar 20, 2019
769ed75
fix qrcodetype
ongspxm Mar 21, 2019
1feb904
fix size option
ongspxm Mar 22, 2019
94c3628
update title
ongspxm Mar 25, 2019
e5193a9
update spacing and margins
ongspxm Mar 25, 2019
a9c2f4b
Update src/_locales/en/messages.json
rugk Mar 26, 2019
e6442ea
Update src/_locales/en/messages.json
rugk Mar 26, 2019
c938306
Update src/_locales/en/messages.json
rugk Mar 26, 2019
76eec80
fix msg text and style
ongspxm Mar 28, 2019
e3a658a
fix font size
ongspxm Mar 28, 2019
7ec5664
undo pointer
ongspxm Mar 28, 2019
4d1c440
Merge branch 'optstyle' of github.com:ongspxm/offline-qr-code into op…
ongspxm Mar 28, 2019
f1559e5
Adjust capitalisation again
rugk Mar 28, 2019
c287e54
separators
ongspxm Mar 29, 2019
886fb2c
shrink gap
ongspxm Mar 29, 2019
7be77a9
side spacing, fixes msg box padding as well, not really fix, should b…
ongspxm Apr 1, 2019
4de1571
actual fix for msg box
ongspxm Apr 1, 2019
efe1703
extract color into var
ongspxm Apr 1, 2019
ad730d2
use br for padding instead
ongspxm Apr 1, 2019
08dc01c
padding for button
ongspxm Apr 1, 2019
7c1f51b
Update src/options/options.css
rugk Apr 2, 2019
ba581e8
Update src/options/options.css
ongspxm Apr 2, 2019
1ddf9bc
Update src/options/options.css
ongspxm Apr 2, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,18 @@
"message": "Some settings are managed by your system administrator and cannot be changed.",
"description": "The message, which appears, when settings are pre-defined (as managed options) by administrators."
},
"titleGeneral": {
"message": "Add-on",
"description": "The title for the general settings group."
},
"titleQrCodeSetting": {
"message": "QR code",
"description": "The title for the qr code settings group."
},
"titleAddonBehavior": {
"message": "Add-on behavior",
"description": "The title for the addon behavior settings group."
},
"optionIsDisabledBecauseManaged": {
"message": "This option is disabled, because it has been configured by your system administrator.",
"description": "The title (tooltip) shown, when hovering over a disabled, managed option."
Expand All @@ -211,14 +223,14 @@

"optionPopupIconColored": {
"message": "Colored icon",
"description": "This is an option shown in the add-on settings."
"description": "This is an option shown in the add-on settings."
},
"optionPopupIconColoredDescr": {
"message": "Shows a colored icon instead of the black/white icon in the toolbar.",
"description": "This is an option shown in the add-on settings. It describes the optionPopupIconColored setting in more details."
},

"optionQrCodeType": {
"subtitleQrCodeType": {
"message": "QR code type",
"description": "The heading/grouping title shown for the radio buttons for the type setting of the QR code."
},
Expand All @@ -239,7 +251,7 @@
"description": "Helper text for canvas QR code type option."
},

"optionQrCodeSize": {
"subtitleQrCodeSize": {
"message": "QR code size",
"description": "The heading/grouping title shown for the radio buttons for the size setting of the QR code."
},
Expand All @@ -264,6 +276,10 @@
"description": "This is an option shown in the add-on settings. It is one option for selecting the QR code size."
},

"subtitleMisc": {
"message": "Miscellaneous settings",
"description": "The heading/grouping title shown for the miscellaneous setting of the QR code."
},
"optionQrQuietZone": {
"message": "QR quiet zone:",
"description": "This is an option shown in the add-on settings. It's about the area around the QR code."
Expand Down
2 changes: 1 addition & 1 deletion src/common/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ a:active {
border-radius: 4px;

/* use whole width */
width: 100%;
width: calc(100% - 8px);
min-height: 32px;

/* make errors selectable, so users can copy them */
Expand Down
107 changes: 57 additions & 50 deletions src/options/options.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
:root {
--gray-separator: rgba(12, 12, 13, 0.15);
}

body {
/* the style the other options in the settings pane use */
font-size: 1.11em;
color: #333;
/* body20 */
font-size: 15px;
padding: 0 8px;
}

/* on (small) mobile displays */
Expand All @@ -20,74 +24,77 @@ body.mobile .mobile-incompatible {
opacity: 0.4;
}

ul {
margin: 0px;
padding: 0px;
section {
margin-bottom: 32px;
}
li {
list-style-type: none;
margin-top: 10px;
padding: 0px;
}
/* in a fieldset e.g. we use a condensed version */
.condensed-list {
margin-left: 0px;

hr {
ongspxm marked this conversation as resolved.
Show resolved Hide resolved
border: 0;
height: 1px;
background-color: var(--gray-separator);
}

fieldset {
/* same border style as separators above */
border: 1px solid;
border-radius: 4px;
border-color: var(--grey-30); /* Firefox: --in-content-box-border-color */
h1 {
margin: 32px 0 16px 0;
padding: 16px 0 0 0;

/* a big width, but not too big */
display: inline-block;
width: auto;
min-width: 60vw;
/* title30 */
font-size: 22px;
font-weight: 300;

margin-bottom: 4px;
border-top: 1px solid var(--gray-separator);
}

/* when a setting has a label *before* it, add some margin */
label + .setting {
margin-left: 8px;
form section:first-child h1 {
ongspxm marked this conversation as resolved.
Show resolved Hide resolved
border-top: none;
margin-top: 16px;
}

.helper-text {
display: block;
color: var(--grey-50);
h2{
/* title20 */
font-size: 17px;
font-weight: 600;
margin: 32px 0 16px 0;
}

margin-top: 4px;
ul {
margin: 0;
padding: 0;
}

/* some margin to align with checkbox */
input[type=checkbox] ~ .helper-text,
input[type=radio] ~ .helper-text {
/* 4px margin-left + 16px size + 3px margin-right + 5px space (#text) */
margin-left: 28px;
li {
list-style-type: none;

padding: 2px 0;
margin: 0 0 4px 0;

display: flex;
align-items: center;
}

/* when a link is used in a helper text, add margin */
.helper-text > a {
margin-left: 4px;
overflow-wrap: none;
li * {
/* https://design.firefox.com/photon/visuals/grid.html#spacing */
margin: 0 8px 0 0;
}

/* special options values */
li.indent {
margin-inline-start: 28px;
}

#popupIconColor {
.helper-text {
/* caption30 */
font-size: 15px;
color: var(--grey-50);
display: inline;
}

#qrQuietZone {
position: relative;
top: 5px;
cursor: pointer;
/* -webkit-appearance: none; */
/* when a link is used in a helper text, add margin */
.helper-text > a {
margin-left: 4px;
overflow-wrap: none;
}

#qrCodeSizeFixedValue {
width: 4.5em;
button {
padding: 4px 8px;
}

/* TODO: make i icon bigger */
Loading