diff --git a/src/index.scss b/src/index.scss index 024226ce..c496bd8a 100644 --- a/src/index.scss +++ b/src/index.scss @@ -20,5 +20,9 @@ } .short-urls-container { - padding: 30px 30px 30px 20px; + padding: 20px 0; + + @media (min-width: $mdMin) { + padding: 30px 30px 30px 20px; + } } diff --git a/src/short-urls/ShortUrlVisits.js b/src/short-urls/ShortUrlVisits.js index fcc8255a..b1c6cb66 100644 --- a/src/short-urls/ShortUrlVisits.js +++ b/src/short-urls/ShortUrlVisits.js @@ -135,7 +135,7 @@ export class ShortUrlsVisits extends React.Component { {!loading && renderCreated()} }
- Original URL: + Long URL:   {loading && Loading...} {!loading && {shortUrl.longUrl}} diff --git a/src/short-urls/ShortUrlsList.js b/src/short-urls/ShortUrlsList.js index 6be4ad2a..68afb2a3 100644 --- a/src/short-urls/ShortUrlsList.js +++ b/src/short-urls/ShortUrlsList.js @@ -53,37 +53,37 @@ export class ShortUrlsList extends React.Component { return ( - + - + - + diff --git a/src/short-urls/ShortUrlsList.scss b/src/short-urls/ShortUrlsList.scss index c1857d4e..514d5622 100644 --- a/src/short-urls/ShortUrlsList.scss +++ b/src/short-urls/ShortUrlsList.scss @@ -1,3 +1,11 @@ +@import "../utils/base"; + +.short-urls-list__header { + @media (max-width: $smMax) { + display: none; + } +} + .short-urls-list__header--with-action { cursor: pointer; } diff --git a/src/short-urls/helpers/ShortUrlsRow.js b/src/short-urls/helpers/ShortUrlsRow.js index c127bc6d..d57bac2f 100644 --- a/src/short-urls/helpers/ShortUrlsRow.js +++ b/src/short-urls/helpers/ShortUrlsRow.js @@ -26,20 +26,21 @@ export class ShortUrlsRow extends React.Component { return ( this.setState({displayMenu: true})} onMouseLeave={() => this.setState({displayMenu: false})} > - - - - - + +
orderBy('dateCreated')} > {renderOrderIcon('dateCreated')} Created at orderBy('shortCode')} > {renderOrderIcon('shortCode')} Short URL orderBy('originalUrl')} > {renderOrderIcon('originalUrl')} - Original URL + Long URL TagsTags orderBy('visits')} > {renderOrderIcon('visits')} Visits   
+ {shortUrl.dateCreated} + {completeShortUrl} + {shortUrl.originalUrl} {this.renderTags(shortUrl.tags)}{shortUrl.visitsCount}{this.renderTags(shortUrl.tags)}{shortUrl.visitsCount}