input field styles and less navigation items

This commit is contained in:
Felix Hamann 2018-06-07 00:34:07 +02:00
parent 99643ff089
commit 2883dedff7
6 changed files with 83 additions and 45 deletions

View File

@ -713,21 +713,15 @@ defaultLinks = -- Define the menu items of the header.
, menuItemAccessCallback' = isJust <$> maybeAuthPair , menuItemAccessCallback' = isJust <$> maybeAuthPair
} }
, NavbarAside $ MenuItem , NavbarAside $ MenuItem
{ menuItemLabel = "Aktuelle Veranstaltungen" { menuItemLabel = "Veranstaltungen"
, menuItemIcon = Just "book" , menuItemIcon = Just "book"
, menuItemRoute = CourseListR -- should be CourseListActiveR or similar in the future , menuItemRoute = CourseListR -- should be CourseListActiveR or similar in the future
, menuItemAccessCallback' = return True , menuItemAccessCallback' = return True
} }
, NavbarAside $ MenuItem , NavbarAside $ MenuItem
{ menuItemLabel = "Alte Veranstaltungen" { menuItemLabel = "Semester"
, menuItemIcon = Just "book" , menuItemIcon = Nothing
, menuItemRoute = CourseListR -- should be CourseListInactiveR or similar in the future , menuItemRoute = CourseListR -- should be TermListR ,,,
, menuItemAccessCallback' = return True
}
, NavbarAside $ MenuItem
{ menuItemLabel = "Veranstaltungen"
, menuItemIcon = Just "book"
, menuItemRoute = CourseListR
, menuItemAccessCallback' = return True , menuItemAccessCallback' = return True
} }
, NavbarAside $ MenuItem , NavbarAside $ MenuItem

View File

@ -32,3 +32,6 @@
.glyphicon--logout::before { .glyphicon--logout::before {
content: '\e163'; content: '\e163';
} }
.glyphicon--none::before {
content: '';
}

View File

@ -126,12 +126,11 @@ table {
th, td { th, td {
text-align: left; text-align: left;
padding: 0 13px 0 7px; padding: 7px;
vertical-align: baseline; vertical-align: baseline;
} }
th:first-child, th:first-child,
td:first-child { td:first-child {
padding-left: 0;
border-left: 0; border-left: 0;
} }
th { th {
@ -189,21 +188,15 @@ button,
transition: all .1s; transition: all .1s;
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
border-radius: 4px;
display: inline-block; display: inline-block;
}
input.btn-primary,
button.btn-primary,
a.btn.btn-primary,
.btn.btn-primary {
background-color: var(--primarybase);
}
input.btn-info, a {
button.btn-info, color: white;
a.btn.btn-info, }
.btn.btn-info {
background-color: var(--infobase) a:hover {
color: white;
}
} }
input[type="submit"][disabled], input[type="submit"][disabled],
@ -226,6 +219,20 @@ a.btn:not([disabled]):hover,
color: white; color: white;
} }
input.btn-primary,
button.btn-primary,
a.btn.btn-primary,
.btn.btn-primary {
background-color: var(--primarybase);
}
input.btn-info,
button.btn-info,
a.btn.btn-info,
.btn.btn-info {
background-color: var(--infobase)
}
input[type="submit"].btn-info:hover, input[type="submit"].btn-info:hover,
input[type="button"].btn-info:hover, input[type="button"].btn-info:hover,
button.btn-info:hover, button.btn-info:hover,

View File

@ -13,7 +13,7 @@ form {
grid-gap: 5px; grid-gap: 5px;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
margin: 10px 0; margin: 17px 0;
padding-left: 10px; padding-left: 10px;
border-left: 2px solid transparent; border-left: 2px solid transparent;
} }
@ -44,6 +44,7 @@ input[type="password"],
input[type="url"], input[type="url"],
input[type="number"], input[type="number"],
input[type="email"] { input[type="email"] {
/*
background-color: rgba(0, 0, 0, 0.05); background-color: rgba(0, 0, 0, 0.05);
padding: 7px 3px 7px; padding: 7px 3px 7px;
outline: 0; outline: 0;
@ -54,6 +55,30 @@ input[type="email"] {
transition: all .1s; transition: all .1s;
font-size: 16px; font-size: 16px;
min-width: 400px; min-width: 400px;
*/
/* from bulma */
background-color: #fff;
border-color: #dbdbdb;
color: #363636;
box-shadow: inset 0 1px 2px rgba(10,10,10,.1);
min-width: 400px;
width: 100%;
-webkit-appearance: none;
align-items: center;
border: 1px solid transparent;
border-radius: 4px;
display: inline-flex;
font-size: 1rem;
height: 2.25em;
justify-content: flex-start;
line-height: 1.5;
padding-bottom: calc(.375em - 1px);
padding-left: calc(.625em - 1px);
padding-right: calc(.625em - 1px);
padding-top: calc(.375em - 1px);
position: relative;
vertical-align: top;
} }
.form-group--required { .form-group--required {
@ -82,32 +107,42 @@ input[type="password"]:focus,
input[type="url"]:focus, input[type="url"]:focus,
input[type="number"]:focus, input[type="number"]:focus,
input[type="email"]:focus { input[type="email"]:focus {
border-bottom-color: var(--lightbase); /* border-bottom-color: var(--lightbase);
background-color: transparent; background-color: transparent;
box-shadow: 0 0 13px var(--lighterbase); box-shadow: 0 0 13px var(--lighterbase); */
border-color: #3273dc;
box-shadow: 0 0 0 0.125em rgba(50,115,220,.25);
outline: 0;
} }
/* BUTTON STYLE SEE default-layout.lucius */ /* BUTTON STYLE SEE default-layout.lucius */
/* TEXTAREAS */ /* TEXTAREAS */
textarea { textarea {
outline: 0; -webkit-appearance: none;
border: 0; border: 1px solid transparent;
padding: 7px 4px; border-radius: 2px;
min-width: 400px; display: inline-flex;
min-height: 100px; font-size: 1rem;
font-family: var(--fontfamilybase); height: 170px;
font-size: 16px; width: 400px;
color: var(--fontbase); line-height: 1.5;
background-color: rgba(0, 0, 0, 0.05); padding-bottom: calc(.375em - 1px);
box-shadow: 0 2px 13px rgba(0, 0, 0, 0.05); padding-left: calc(.625em - 1px);
border-bottom: 2px solid var(--darkbase); padding-right: calc(.625em - 1px);
padding-top: calc(.375em - 1px);
position: relative;
vertical-align: top;
background-color: #fff;
border-color: #dbdbdb;
color: #363636;
box-shadow: inset 0 1px 2px rgba(10,10,10,.1);
} }
textarea:focus { textarea:focus {
background-color: transparent; border-color: #3273dc;
border-bottom-color: var(--lightbase); box-shadow: 0 0 0 0.125em rgba(50,115,220,.25);
box-shadow: 0 0 13px var(--lighterbase); outline: 0;
} }
/* CUSTOM LEGACY CHECKBOX AND RADIO BOXES */ /* CUSTOM LEGACY CHECKBOX AND RADIO BOXES */

View File

@ -8,8 +8,7 @@ $newline never
$of NavbarAside (MenuItem label mIcon route _) $of NavbarAside (MenuItem label mIcon route _)
<li .asidenav__list-item :Just route == mcurrentRoute:.asidenav__list-item--active> <li .asidenav__list-item :Just route == mcurrentRoute:.asidenav__list-item--active>
<a .asidenav__link-wrapper href=@{route}> <a .asidenav__link-wrapper href=@{route}>
$if isJust mIcon <div .glyphicon.glyphicon--#{fromMaybe "none" mIcon}>
<div .glyphicon.glyphicon--#{fromMaybe "" mIcon}>
<div .asidenav__link-label>#{label} <div .asidenav__link-label>#{label}
$of _ $of _

View File

@ -1,10 +1,10 @@
.page-nav-prime { .page-nav-prime {
background-color: var(--lightgreybase); background-color: var(--lightgreybase);
padding: 13px; padding: 13px;
margin-top: 30px;
} }
.page-nav-prime .pagenav__list { .page-nav-prime .pagenav__list {
margin: 7px 0 0;
display: block; display: block;
} }
.page-nav-prime .pagenav__list-item { .page-nav-prime .pagenav__list-item {