valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.fakecake.org:tt-rss

This commit is contained in:
Andrew Dolgov 2015-08-13 09:52:01 +03:00
parent dcbe36b2a2 2b925f3216
commit 5e11d53429
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
css/dijit.css
View File

@ -471,6 +471,7 @@ button[disabled],
float :right; float :right;
} }
.claro select,
.claro .dijitDownArrowButton.dijitSelect { .claro .dijitDownArrowButton.dijitSelect {
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
@ -490,6 +491,8 @@ button[disabled],
border-width : 0px; border-width : 0px;
} }
.claro select,
.claro textarea,
.claro .input.input-text, .claro .input.input-text,
.claro .dijitTextBox { .claro .dijitTextBox {
display: inline-block; display: inline-block;
@ -504,11 +507,17 @@ button[disabled],
border-radius: 4px; border-radius: 4px;
margin-bottom : 4px; margin-bottom : 4px;
} }
.claro textarea {
height : auto;
}
.claro select,
.claro .input.input-text { .claro .input.input-text {
height : 30px; height : 30px;
} }
.claro textarea,
.claro select,
.claro .input.input-text, .claro .input.input-text,
.claro .dijitTextBox, .claro .dijitTextBox,
.claro .dijitSelect { .claro .dijitSelect {
@ -523,6 +532,7 @@ button[disabled],
transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s;
} }
.claro select:focus,
.claro .input.input-text:focus, .claro .input.input-text:focus,
.claro .dijitTextBox.dijitFocused, .claro .dijitTextBox.dijitFocused,
.claro .dijitSelect.dijitFocused { .claro .dijitSelect.dijitFocused {
@ -617,4 +627,4 @@ button[disabled],
.claro .dijitProgressBar .dijitProgressBarLabel { .claro .dijitProgressBar .dijitProgressBarLabel {
color : white; color : white;
} }

14
install/index.php
View File

@ -8,7 +8,7 @@
textarea { font-size : 12px; } textarea { font-size : 12px; }
</style> </style>
</head> </head>
<body> <body class="claro">
<?php <?php
@ -263,28 +263,28 @@
<fieldset> <fieldset>
<label>Username</label> <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>
<fieldset> <fieldset>
<label>Password</label> <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>
<fieldset> <fieldset>
<label>Database name</label> <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>
<fieldset> <fieldset>
<label>Host name</label> <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> <span class="hint">If needed</span>
</fieldset> </fieldset>
<fieldset> <fieldset>
<label>Port</label> <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> <span class="hint">Usually 3306 for MySQL or 5432 for PostgreSQL</span>
</fieldset> </fieldset>
@ -294,7 +294,7 @@
<fieldset> <fieldset>
<label>Tiny Tiny RSS URL</label> <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> </fieldset>