hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 10:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' of https://github.com/pablolarvor/Telescope into pablolarvor-devel

Browse source
This commit is contained in:
Sacha Greif 2016-02-05 15:39:04 +09:00
commit ebb26c89b1
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/telescope-settings/lib/settings.js
View file

@ -296,7 +296,8 @@ Settings.schema = new SimpleSchema({
optional: true,
autoform: {
group: "05_colors",
instructions: 'Used for button backgrounds.'
instructions: 'Used for button backgrounds.',
type: "bootstrap-minicolors"
}
},
accentContrastColor: {
@ -304,7 +305,8 @@ Settings.schema = new SimpleSchema({
optional: true,
autoform: {
group: "05_colors",
instructions: 'Used for button text.'
instructions: 'Used for button text.',
type: "bootstrap-minicolors"
}
},
secondaryColor: {
@ -312,7 +314,8 @@ Settings.schema = new SimpleSchema({
optional: true,
autoform: {
group: "05_colors",
instructions: 'Used for the navigation background.'
instructions: 'Used for the navigation background.',
type: "bootstrap-minicolors"
}
},
secondaryContrastColor: {
@ -320,7 +323,8 @@ Settings.schema = new SimpleSchema({
optional: true,
autoform: {
group: "05_colors",
instructions: 'Used for header text.'
instructions: 'Used for header text.',
type: "bootstrap-minicolors"
}
},
fontUrl: {

5
packages/telescope-settings/package.js
View file

@ -11,8 +11,9 @@ Package.onUse(function(api) {
api.versionsFrom(['METEOR@1.0']);
api.use([
'telescope:lib@0.25.7',
'telescope:i18n@0.25.7'
'telescope:lib@0.25.7',
'telescope:i18n@0.25.7',
'hausor:autoform-bs-minicolors@1.0.0'
]);
api.addFiles([

6
packages/telescope-theme-base/lib/client/scss/global/_forms.scss
View file

@ -55,6 +55,10 @@ form, .accounts-dialog{
display:inline-block;
margin-bottom:0;
}
.minicolors-theme-bootstrap .minicolors-swatch {
top: 1px;
left: 1px;
}
}
&.inline{
.controls{
@ -240,4 +244,4 @@ fieldset{
border-bottom: 1px solid #B5B0B0;
padding-bottom: 40px;
margin: 0 auto 40px auto;
}
}