Merge remote-tracking branch 'origin/piece-detail-setup' into piece-detail-setup

This commit is contained in:
ddejongh 2015-06-02 14:00:45 +02:00
commit 6160659964
2 changed files with 5 additions and 4 deletions

View File

@ -5,9 +5,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>ascribe</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="build/css/main.css">
<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Sans+Pro:400,600,700,900">
<link rel="stylesheet" href="node_modules/react-datepicker/dist/react-datepicker.css">
<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Sans+Pro:400,600,700,900">
<link rel="stylesheet" href="build/css/main.css">
</head>
<body>
<div id="main" class="container clear-margins-and-paddings"></div>

View File

@ -162,7 +162,8 @@
text-transform: uppercase;
}
.input-text-ascribe {
.input-text-ascribe,
.datepicker__input {
border-bottom: 1px solid black;
border-top: 0;
border-left: 0;
@ -240,4 +241,4 @@
.col-bottom {
vertical-align: bottom;
}
}