Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
idk
  • Loading branch information
@etl12003
etl12003 committed Apr 23, 2017
1 parent 7275cae commit 6de3b65
Show file tree
Hide file tree
Showing 27 changed files with 4,739 additions and 4,738 deletions.
Empty file modified Wello/platforms/browser/cordova/build 100644 → 100755
View file
Empty file.
Empty file modified Wello/platforms/browser/cordova/clean 100644 → 100755
View file
Empty file.
Empty file modified Wello/platforms/browser/cordova/run 100644 → 100755
View file
Empty file.
Empty file modified Wello/platforms/browser/cordova/version 100644 → 100755
View file
Empty file.
2 changes: 1 addition & 1 deletion Wello/www/PhpMyAdmin/js/jquery/jquery-1.8.3.min.js
View file

Large diffs are not rendered by default.

1,224 changes: 612 additions & 612 deletions Wello/www/PhpMyAdmin/libraries/phpseclib/Crypt/AES.php
View file

Large diffs are not rendered by default.

2,958 changes: 1,479 additions & 1,479 deletions Wello/www/PhpMyAdmin/libraries/phpseclib/Crypt/Rijndael.php
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Wello/www/PhpMyAdmin/libraries/select_lang.lib.php
View file
Expand Up @@ -521,11 +521,11 @@ $GLOBALS['l']['w_page'] = __('Page number:');


// now, that we have loaded the language strings we can send the errors
if ($GLOBALS['lang_failed_cfg']
|| $GLOBALS['lang_failed_cookie']
|| $GLOBALS['lang_failed_request']) {
if ($GLOBALS['lang_failed_cfg']
|| $GLOBALS['lang_failed_cookie']
|| $GLOBALS['lang_failed_request']) {
trigger_error(
__('Ignoring unsupported language code'),
__('Ignoring unsupported language code'),
E_USER_ERROR
);
}
Expand Down
126 changes: 63 additions & 63 deletions Wello/www/css/desktop.css
View file
@@ -1,63 +1,63 @@
@media only screen and (min-width: 40.75em) {
div.well-card {
border: 2px solid #4d4d4d;
margin: 1.5rem;
max-width: 41rem;
}

main.list {
display: flex;
flex-direction: column;
/* justify-content: center;*/
align-items: center;
}

main.list h1{
display: block;
}

main.list a{
width: 75%;
max-width: 41rem;
}
}

@media only screen and (min-width: 45em) {
div.well-card {
border: 2px solid #4d4d4d;
margin: 1.5rem;
max-width: 41rem;
}
main.search{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}

main.search a{
color: inherit;
width: 50%;
max-width: 41rem;
}



}

@media only screen and (min-width: 25em) {
main.details{
max-width: 25rem;
margin-left: auto;
margin-right: auto;
margin-top: 8rem;
}
#add-well{
display: flex;
flex-direction: column;
align-items: center;
}
main.map{
margin-top: 0;
}
}
@media only screen and (min-width: 40.75em) {
div.well-card {
border: 2px solid #4d4d4d;
margin: 1.5rem;
max-width: 41rem;
}

main.list {
display: flex;
flex-direction: column;
/* justify-content: center;*/
align-items: center;
}

main.list h1{
display: block;
}

main.list a{
width: 75%;
max-width: 41rem;
}
}

@media only screen and (min-width: 45em) {
div.well-card {
border: 2px solid #4d4d4d;
margin: 1.5rem;
max-width: 41rem;
}
main.search{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}

main.search a{
color: inherit;
width: 50%;
max-width: 41rem;
}



}

@media only screen and (min-width: 25em) {
main.details{
max-width: 25rem;
margin-left: auto;
margin-right: auto;
margin-top: 8rem;
}
#add-well{
display: flex;
flex-direction: column;
align-items: center;
}
main.map{
margin-top: 0;
}
}
1 change: 1 addition & 0 deletions Wello/www/css/main.css
View file
Expand Up @@ -131,6 +131,7 @@ nav h1{
flex-grow: 1;
margin: 0 0;
font-size: 1.5rem;
margin-left: 1.25rem;
}
h1.title{
display: none;
Expand Down
152 changes: 76 additions & 76 deletions Wello/www/css/map-desktop.css
View file
@@ -1,76 +1,76 @@
@media only screen and (min-width: 65em) {
/* Style adjustments for viewports that meet the condition */
nav.top-nav{
width: 5rem;
}
nav.top-nav div.main-bttns{
flex-direction: column;
}
nav.top-nav h1{
display: none;
}
nav .slide-menu{
}

nav.bottom-nav{
width: 5rem;
flex-direction: column;
height: calc(100vh - 5rem);
margin-top: 0rem;
justify-content: flex-start;
padding-top: 5rem;
}
nav.bottom-nav button, nav.bottom-nav a{
margin-bottom: 3rem;
}

main.map div.well-card{
margin-left: 0;
margin-right: 0;
top: auto;
bottom: 1rem;
left: auto;
right: auto;
display: none;
}

div.desk-details{
display: block;
position: fixed;
right: 0;
top: 0;
width: 23rem;
height: 100vh;
overflow-y: scroll;
border-left: solid black 2px;
background-color: white;
}
div.desk-details ul{
margin: 1rem
}
div.desk-details li, div.desk-details p{
margin: 0rem
}
nav.fabs{
left: 6rem;
bottom: 1rem;
}
main.details{
margin-top: 0rem;
}
a.go-to{
/*
width: 23rem;
background-color: #65b2ff;
color: white;
*/
font-size: 1.25rem;
color: #65b2ff;
/*
margin: 0 0 0 0;
padding: 2rem;
*/
float: right;
margin: 1rem;
}
}
@media only screen and (min-width: 65em) {
/* Style adjustments for viewports that meet the condition */
nav.top-nav{
width: 5rem;
}
nav.top-nav div.main-bttns{
flex-direction: column;
}
nav.top-nav h1{
display: none;
}
nav .slide-menu{
}

nav.bottom-nav{
width: 5rem;
flex-direction: column;
height: calc(100vh);
margin-top: 0rem;
justify-content: flex-start;
padding-top: 8rem;
}
nav.bottom-nav button, nav.bottom-nav a{
margin-bottom: 3rem;
}

main.map div.well-card{
margin-left: 0;
margin-right: 0;
top: auto;
bottom: 1rem;
left: auto;
right: auto;
display: none;
}

div.desk-details{
display: block;
position: fixed;
right: 0;
top: 0;
width: 23rem;
height: 100vh;
overflow-y: scroll;
border-left: solid black 2px;
background-color: white;
}
div.desk-details ul{
margin: 1rem
}
div.desk-details li, div.desk-details p{
margin: 0rem
}
nav.fabs{
left: 6rem;
bottom: 1rem;
}
main.details{
margin-top: 0rem;
}
a.go-to{
/*
width: 23rem;
background-color: #65b2ff;
color: white;
*/
font-size: 1.25rem;
color: #65b2ff;
/*
margin: 0 0 0 0;
padding: 2rem;
*/
float: right;
margin: 1rem;
}
}
82 changes: 41 additions & 41 deletions Wello/www/css/well-card.css
View file
@@ -1,41 +1,41 @@
div.well-card div{
float: left;
width: 65%;
padding: 1rem;
}

div.well-card h2{
border-bottom: none;
margin: 0;
font-size: 1rem;
}
div.well-card p{
border-bottom: none;
margin-top: .25rem;
}
div.well-card {
border-bottom: 2px solid #4d4d4d;
max-width: 41rem;
width: calc(100% - 16px);
box-sizing: border-box;
/* display: block;*/
/* margin-left: 0;*/
/* margin-right: 0;*/
}

div.well-card .well-img{
background-image: url(https://s-media-cache-ak0.pinimg.com/originals/33/c2/c4/33c2c4cf367ecee38a162d362a31fd68.jpg);
background-size: cover;
background-position: center;
float: left;
width: 35%;
height: 8rem;
}

a.search-result{
color: inherit;
}

@media only screen and (min-width: 65em) {

}
div.well-card div{
float: left;
width: 65%;
padding: 1rem;
}

div.well-card h2{
border-bottom: none;
margin: 0;
font-size: 1rem;
}
div.well-card p{
border-bottom: none;
margin-top: .25rem;
}
div.well-card {
border-bottom: 2px solid #4d4d4d;
max-width: 41rem;
width: calc(100% - 16px);
box-sizing: border-box;
/* display: block;*/
/* margin-left: 0;*/
/* margin-right: 0;*/
}

div.well-card .well-img{
background-image: url(https://s-media-cache-ak0.pinimg.com/originals/33/c2/c4/33c2c4cf367ecee38a162d362a31fd68.jpg);
background-size: cover;
background-position: center;
float: left;
width: 35%;
height: 8rem;
}

a.search-result{
color: inherit;
}

@media only screen and (min-width: 65em) {

}

0 comments on commit 6de3b65

Please sign in to comment.