git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Aung Myo
2017-06-09 12:04:36 +06:30
parent ba9ebe12de e7a1687b85
commit 406172c6ff
82 changed files with 2071 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/origami/request_bills.scss → app/assets/stylesheets/api/origami/paypar.scss
View File

@@ -1,3 +1,3 @@
// Place all the styles related to the origami/RequestBills controller here.
// Place all the styles related to the api/origami/paypar controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/membership_actions.scss Normal file
View File

@@ -0,0 +1,3 @@
// Place all the styles related to the membership_actions controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

7
app/assets/stylesheets/orgiami.scss → app/assets/stylesheets/origami.scss
View File

@@ -69,3 +69,10 @@
.green{
background-color: #009900
}
/*----- Reset -----*/
select.form-control {
height: inherit !important;
}

3
app/assets/stylesheets/settings/membership_actions.scss Normal file
View File

@@ -0,0 +1,3 @@
// Place all the styles related to the settings/membership_actions controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/