diff options
author | Andrew Dolgov <[email protected]> | 2015-08-13 09:52:01 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-08-13 09:52:01 +0300 |
commit | 5e11d53429533bf1f5e49bbe7f2d4419677e1462 (patch) | |
tree | 88f9e92c7c949c8d1a19e7a0b51b9b3414a54dcb | |
parent | dcbe36b2a26965b1280daed89cba6db2085cabfb (diff) | |
parent | 2b925f3216d541e62a139bb28114f2479afabd93 (diff) |
Merge branch 'master' of git.fakecake.org:tt-rss
-rw-r--r-- | css/dijit.css | 12 | ||||
-rw-r--r-- | install/index.php | 14 |
2 files changed, 18 insertions, 8 deletions
diff --git a/css/dijit.css b/css/dijit.css index 3621d2cc7..f3fbc686e 100644 --- a/css/dijit.css +++ b/css/dijit.css @@ -471,6 +471,7 @@ button[disabled], float :right; } +.claro select, .claro .dijitDownArrowButton.dijitSelect { -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -490,6 +491,8 @@ button[disabled], border-width : 0px; } +.claro select, +.claro textarea, .claro .input.input-text, .claro .dijitTextBox { display: inline-block; @@ -504,11 +507,17 @@ button[disabled], border-radius: 4px; margin-bottom : 4px; } +.claro textarea { + height : auto; +} +.claro select, .claro .input.input-text { height : 30px; } +.claro textarea, +.claro select, .claro .input.input-text, .claro .dijitTextBox, .claro .dijitSelect { @@ -523,6 +532,7 @@ button[disabled], transition: border linear 0.2s, box-shadow linear 0.2s; } +.claro select:focus, .claro .input.input-text:focus, .claro .dijitTextBox.dijitFocused, .claro .dijitSelect.dijitFocused { @@ -617,4 +627,4 @@ button[disabled], .claro .dijitProgressBar .dijitProgressBarLabel { color : white; -}
\ No newline at end of file +} diff --git a/install/index.php b/install/index.php index 346765579..e18583436 100644 --- a/install/index.php +++ b/install/index.php @@ -8,7 +8,7 @@ textarea { font-size : 12px; } </style> </head> -<body> +<body class="claro"> <?php @@ -263,28 +263,28 @@ <fieldset> <label>Username</label> - <input required name="DB_USER" size="20" value="<?php echo $DB_USER ?>"/> + <input class="input input-text" required name="DB_USER" size="20" value="<?php echo $DB_USER ?>"/> </fieldset> <fieldset> <label>Password</label> - <input name="DB_PASS" size="20" type="password" value="<?php echo $DB_PASS ?>"/> + <input class="input input-text" name="DB_PASS" size="20" type="password" value="<?php echo $DB_PASS ?>"/> </fieldset> <fieldset> <label>Database name</label> - <input required name="DB_NAME" size="20" value="<?php echo $DB_NAME ?>"/> + <input class="input input-text" required name="DB_NAME" size="20" value="<?php echo $DB_NAME ?>"/> </fieldset> <fieldset> <label>Host name</label> - <input name="DB_HOST" size="20" value="<?php echo $DB_HOST ?>"/> + <input class="input input-text" name="DB_HOST" size="20" value="<?php echo $DB_HOST ?>"/> <span class="hint">If needed</span> </fieldset> <fieldset> <label>Port</label> - <input name="DB_PORT" type="number" size="20" value="<?php echo $DB_PORT ?>"/> + <input class="input input-text" name="DB_PORT" type="number" size="20" value="<?php echo $DB_PORT ?>"/> <span class="hint">Usually 3306 for MySQL or 5432 for PostgreSQL</span> </fieldset> @@ -294,7 +294,7 @@ <fieldset> <label>Tiny Tiny RSS URL</label> - <input type="url" name="SELF_URL_PATH" placeholder="<?php echo $SELF_URL_PATH; ?>" size="60" value="<?php echo $SELF_URL_PATH ?>"/> + <input class="input input-text" type="url" name="SELF_URL_PATH" placeholder="<?php echo $SELF_URL_PATH; ?>" size="60" value="<?php echo $SELF_URL_PATH ?>"/> </fieldset> |